summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2006-12-13 04:05:39 +0100
committerLibravatar Junio C Hamano <junkio@cox.net>2006-12-12 21:55:37 -0800
commitf953831e030d3ece7346bdb5c4fde4fde43c925e (patch)
treed1b9565216e59cb8af65829bf04fe18e58d964c3 /git-merge-stupid.sh
parentMerge branch 'master' into js/merge (diff)
downloadtgif-f953831e030d3ece7346bdb5c4fde4fde43c925e.tar.xz
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>
Diffstat (limited to 'git-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions