From: Junio C Hamano <junkio@cox.net>
Date: Tue, 8 Nov 2005 06:03:46 +0000 (-0800)
Subject: merge with /dev/null as base, instead of punting O==empty case
X-Git-Tag: v0.99.9h^2~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f7d24bbefb06c40f7738f471dda561ab45496d24?ds=inline;hp=f7d24bbefb06c40f7738f471dda561ab45496d24

Merge ... /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>
---