X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-one-file.sh;fp=git-merge-one-file.sh;h=d9ee4581504984e4337a70433f82c411bb5a9c02;hb=cb93c19365760d939f05d9a3c2ef4499f0d5ce16;hp=32e17cbc61341a0b6b04d0556aa59bd95a73cb45;hpb=f7d24bbefb06c40f7738f471dda561ab45496d24;p=git.git

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 32e17cbc..d9ee4581 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