diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-05 16:36:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-05 16:36:13 (GMT) |
| commit | 09ce4bb6ea7c06c1de82f042cb3ade622b0fa36c (patch) | |
| tree | 9b321628bf9932845625fc290285fcb10a2fbc85 /git-merge-one-file.sh | |
| parent | 46856f4e9d3d0fbfe1888ee19d632dfc04de8fab (diff) | |
| download | git-09ce4bb6ea7c06c1de82f042cb3ade622b0fa36c.zip git-09ce4bb6ea7c06c1de82f042cb3ade622b0fa36c.tar.gz git-09ce4bb6ea7c06c1de82f042cb3ade622b0fa36c.tar.bz2 | |
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-x | git-merge-one-file.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index 3145009..b86402a 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 |