| commit | 7061f5c2c5fdde49a952db9dfe09bcfd8b8f9794 | |
| author | Daniel Barkalow <barkalow@iabervon.org> | |
| Sun, 25 Sep 2005 03:50:04 +0000 (24 23:50 -0400) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 25 Sep 2005 05:05:55 +0000 (24 22:05 -0700) | ||
| tree | 572ada7f126f8bfad8a9fb914d2f85d4a82c6b35 | treesnapshot (tar.gz zip) |
| parent | c3bc895c81b6ec6906be7e6739edb4a50eecf6e9 | commitdiff |
[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>
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>
| Documentation/technical/trivial-merge.txt | diffblobblamehistory |