summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-08 06:03:46 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-12 05:18:17 (GMT)
commitf7d24bbefb06c40f7738f471dda561ab45496d24 (patch)
tree1d119624876dc24e31d0f520fe86447ade63cec2 /apply.c
parent6fd72e39af8a69615d32c3fd4d5fe0788f54a2ea (diff)
downloadgit-f7d24bbefb06c40f7738f471dda561ab45496d24.zip
git-f7d24bbefb06c40f7738f471dda561ab45496d24.tar.gz
git-f7d24bbefb06c40f7738f471dda561ab45496d24.tar.bz2
merge with /dev/null as base, instead of punting O==empty case
Instead of leaving the path unmerged in a case where each side adds different version of the same path, attempt to merge it with empty base and leave "our" version in the index file, just like we do for the case in conflicting merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'apply.c')
0 files changed, 0 insertions, 0 deletions