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)
commitf953831...030d3ece7346bdb5c4fde4fde43c925e
treed1b9565...16e59cb8af65829bf04fe18e58d964c3copy hash to clipboard (tree)
parent8042ed1...ebd37419ff38f540482355c0f1d30936copy hash to clipboard (diff)
merge-recursive.c
t/t6024-recursive-merge.sh [changed mode: 0755->0644]