diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index d067894bf45fd0a50513e196ea2a5e671d901681..3145009f4be40d367f52f16dc2b7edb00d153137 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
# 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