X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-one-file.sh;h=3145009f4be40d367f52f16dc2b7edb00d153137;hb=176959d7423988183ffbe1b35fc1de7f786bb596;hp=d067894bf45fd0a50513e196ea2a5e671d901681;hpb=3325cea0f7ef7355f6806b2fc88acdb2e27785ac;p=git.git

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index d067894bf..3145009f4 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -107,7 +107,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 		# 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
+		$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