summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-05 09:36:13 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-05 09:36:13 -0700
commit09ce4bb6ea7c06c1de82f042cb3ade622b0fa36c (patch)
tree9b321628bf9932845625fc290285fcb10a2fbc85 /git-merge-one-file.sh
parent46856f4e9d3d0fbfe1888ee19d632dfc04de8fab (diff)
downloadgit-09ce4bb6ea7c06c1de82f042cb3ade622b0fa36c.tar.gz
build: propagate $DIFF to scripts
git-merge-one-file expects to run "-u" capable "diff", but using $DIFF is not the right way to do so. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
-rwxr-xr-xgit-merge-one-file.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 3145009f4b..b86402afa5 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