From cb93c19365760d939f05d9a3c2ef4499f0d5ce16 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 9 Nov 2005 20:38:33 -0800 Subject: 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 --- git-merge-one-file.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'git-merge-one-file.sh') diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index 32e17cbc61..d9ee458150 100755 --- a/git-merge-one-file.sh +++ b/git-merge-one-file.sh @@ -57,18 +57,20 @@ case "${1:-.}${2:-.}${3:-.}" in # Modified in both, but differently. # "$1$2$3" | ".$2$3") + src2=`git-unpack-file $3` case "$1" in '') echo "Added $4 in both, but differently." + # This extracts OUR file in $orig, and uses git-apply to + # remove lines that are unique to ours. orig=`git-unpack-file $2` - : >$orig + diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add ;; *) echo "Auto-merging $4." orig=`git-unpack-file $1` ;; esac - src2=`git-unpack-file $3` # We reset the index to the first branch, making # git-diff-file useful -- cgit v1.2.3