diff options
| author | Daniel Barkalow <barkalow@iabervon.org> | 2005-09-25 07:50:04 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-25 09:05:55 +0400 |
| commit | 7061f5c2c5fdde49a952db9dfe09bcfd8b8f9794 (patch) | |
| tree | 572ada7f126f8bfad8a9fb914d2f85d4a82c6b35 /cmd-rename.sh | |
| parent | c3bc895c81b6ec6906be7e6739edb4a50eecf6e9 (diff) | |
[PATCH] Finish documenting trivial merge rules
Fix missing symbol explanations, a few incorrect cases, and add
two-way merge rules.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'cmd-rename.sh')
0 files changed, 0 insertions, 0 deletions