X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-merge-one-file.sh;h=b86402afa5d079df8d1cf6eebb15e5727cc8a5de;hb=7e7db5e4520388d3a6f1efbe2f7a29d43bd06a2b;hp=d067894bf45fd0a50513e196ea2a5e671d901681;hpb=954f7cfdac48b8d9fe91c29ecfa44ac0c639867c;p=git.git

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index d067894bf..b86402afa 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