From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 5 Jun 2010 16:36:13 +0000 (-0700)
Subject: build: propagate $DIFF to scripts
X-Git-Tag: v1.7.2-rc0~32^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/09ce4bb6ea7c06c1de82f042cb3ade622b0fa36c?hp=09ce4bb6ea7c06c1de82f042cb3ade622b0fa36c

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>
---