diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-05 09:36:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-05 09:36:13 -0700 |
| commit | 09ce4bb6ea7c06c1de82f042cb3ade622b0fa36c (patch) | |
| tree | 9b321628bf9932845625fc290285fcb10a2fbc85 /userdiff.h | |
| parent | Makefile: Tru64 portability fix (diff) | |
| download | tgif-09ce4bb6ea7c06c1de82f042cb3ade622b0fa36c.tar.xz | |
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 'userdiff.h')
0 files changed, 0 insertions, 0 deletions