summaryrefslogtreecommitdiff
path: root/t/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-01 00:35:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-01 00:35:20 (GMT)
commit7b3bdbb335b6be938b4748e86a41357e51c97804 (patch)
tree06ebfd196fa75f0e8cc1bbc23449b60807f824ba /t/Makefile
parent4fdf71be1ca3a817851a14f91b75e7d30f885a48 (diff)
downloadgit-7b3bdbb335b6be938b4748e86a41357e51c97804.zip
git-7b3bdbb335b6be938b4748e86a41357e51c97804.tar.gz
git-7b3bdbb335b6be938b4748e86a41357e51c97804.tar.bz2
fixup: do not unconditionally disable "diff -u"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/Makefile')
-rw-r--r--t/Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/t/Makefile b/t/Makefile
index 93a6475..25c559b 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -6,14 +6,10 @@
-include ../config.mak
#GIT_TEST_OPTS=--verbose --debug
-GIT_TEST_CMP ?= $(DIFF)
SHELL_PATH ?= $(SHELL)
TAR ?= $(TAR)
RM ?= rm -f
-# Make sure test-lib.sh uses make's value of GIT_TEST_CMP
-export GIT_TEST_CMP
-
# Shell quote;
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))