Code

merge-one-file: use common as base, instead of emptiness.
authorJunio C Hamano <junkio@cox.net>
Thu, 10 Nov 2005 04:38:33 +0000 (20:38 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 12 Nov 2005 05:18:17 +0000 (21:18 -0800)
commitcb93c19365760d939f05d9a3c2ef4499f0d5ce16
tree7427fa1e25c61e2d647d8cbf314289d0616d021c
parentf7d24bbefb06c40f7738f471dda561ab45496d24
merge-one-file: use common as base, instead of emptiness.

Unlike the previous round that merged the path added differently
in each branches using emptiness as the base, compute a common
version and use it as input to 'merge' program.

This would show the resulting (still conflicting) file left in
the working tree as:

common file contents...
<<<<<< FILENAME
version from our branch...
======
version from their branch...
>>>>>> .merge_file_XXXXXX
more common file contents...

when both sides added similar contents.

Signed-off-by: Junio C Hamano <junkio@cox.net>
apply.c
git-merge-one-file.sh