Junio C Hamano 09ce4bb6ea 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>

2010-06-05 09:36:13 -07:00

3.7 KiB

Executable File

Raw Blame History

View Raw