]> git.ipfire.org Git - thirdparty/git.git/commit - Makefile
build: propagate $DIFF to scripts
authorJunio C Hamano <gitster@pobox.com>
Sat, 5 Jun 2010 16:36:13 +0000 (09:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 5 Jun 2010 16:36:13 +0000 (09:36 -0700)
commit09ce4bb6ea7c06c1de82f042cb3ade622b0fa36c
tree9b321628bf9932845625fc290285fcb10a2fbc85
parent46856f4e9d3d0fbfe1888ee19d632dfc04de8fab
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>
Makefile
git-merge-one-file.sh