diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 32e17cbc61341a0b6b04d0556aa59bd95a73cb45..b08597de29afc6bc1aaddf7b817bc122cd517b04 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
# 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
+ sz0=`wc -c <"$orig"`
+ diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add
+ sz1=`wc -c <"$orig"`
+
+ # If we do not have enough common material, it is not
+ # worth trying two-file merge using common subsections.
+ expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
;;
*)
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