summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-05 16:36:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-05 16:36:13 (GMT)
commit09ce4bb6ea7c06c1de82f042cb3ade622b0fa36c (patch)
tree9b321628bf9932845625fc290285fcb10a2fbc85 /diff.h
parent46856f4e9d3d0fbfe1888ee19d632dfc04de8fab (diff)
downloadgit-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 'diff.h')
0 files changed, 0 insertions, 0 deletions