Commits

Anonymous committed fd66dbf

merge-one-file: use empty- or common-base condintionally in two-stage merge.

If two sides added the same path completely different thing, it is
easier to see the merge pivoting on /dev/null. So check the size of
the common section we have found, and empty it if it is too small.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Comments (0)

Files changed (1)

git-merge-one-file.sh

 		# This extracts OUR file in $orig, and uses git-apply to
 		# remove lines that are unique to ours.
 		orig=`git-unpack-file $2`
+		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."