| commit | f953831e030d3ece7346bdb5c4fde4fde43c925e | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Wed, 13 Dec 2006 03:05:39 +0000 (13 04:05 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 13 Dec 2006 05:55:37 +0000 (12 21:55 -0800) | ||
| tree | d1b9565216e59cb8af65829bf04fe18e58d964c3 | treesnapshot (tar.gz zip) |
| parent | 8042ed1cebd37419ff38f540482355c0f1d30936 | commitdiff |
merge-recursive: add/add really is modify/modify with an empty base
Unify the handling for cases C (add/add) and D (modify/modify).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Unify the handling for cases C (add/add) and D (modify/modify).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diffblobblamehistory | |
| t/t6024-recursive-merge.sh | [changed mode: 0755->0644] | diffblobblamehistory |