projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8042ed1) | patch
merge-recursive: add/add really is modify/modify with an empty base
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Wed, 13 Dec 2006 03:05:39 +0000 (04:05 +0100)
committerJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 05:55:37 +0000 (21:55 -0800)
commitf953831e030d3ece7346bdb5c4fde4fde43c925e
treed1b9565216e59cb8af65829bf04fe18e58d964c3tree | snapshot
parent8042ed1cebd37419ff38f540482355c0f1d30936commit | diff
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>
merge-recursive.c diff | blob | history
t/t6024-recursive-merge.sh [changed mode: 0755->0644] diff | blob | history
Git—the stupid content tracker