X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-one-file.sh;h=7aeb96952f668baef2fd18383806e13a20415f19;hb=67e223edc4013b0b3b1caad336e4a43f6d4c66b8;hp=bb64a72ad3b8db6f43fafc5af87a1697b4bf2989;hpb=6aaeca900b05a8265d1930d3dc0a2df19002771f;p=git.git

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index bb64a72ad..7aeb96952 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -112,7 +112,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