summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-11 09:40:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-11 13:45:05 -0700
commit5e87eae97df69a48a575fd79131e85067f9dbf13 (patch)
treec394c8e9a152e1f26a5fead39e2b8f0ef54b6b5d /xdiff/xmerge.c
parentbuild: propagate $DIFF to scripts (diff)
downloadtgif-5e87eae97df69a48a575fd79131e85067f9dbf13.tar.xz
test-lib: use DIFF definition from GIT-BUILD-OPTIONS
Otherwise running individual tests from t/ directory may lack the definition of $DIFF, $GIT_TEST_CMP and friends. Noticed and initial patch provided by Thomas Rast, alternative solution suggested by Brandon Casey, which this patch implements. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Thomas Rast <trast@student.ethz.ch>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions