aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-31 17:35:20 -0700
committerJunio C Hamano <gitster@pobox.com>2010-05-31 17:35:20 -0700
commit7b3bdbb335b6be938b4748e86a41357e51c97804 (patch)
tree06ebfd196fa75f0e8cc1bbc23449b60807f824ba /Makefile
parent4fdf71be1ca3a817851a14f91b75e7d30f885a48 (diff)
downloadgit-7b3bdbb335b6be938b4748e86a41357e51c97804.tar.gz
git-7b3bdbb335b6be938b4748e86a41357e51c97804.tar.xz
fixup: do not unconditionally disable "diff -u"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 668dbc96c..c8cc9e280 100644
--- a/Makefile
+++ b/Makefile
@@ -1374,6 +1374,10 @@ ifdef USE_NED_ALLOCATOR
COMPAT_OBJS += compat/nedmalloc/nedmalloc.o
endif
+ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT
+ export GIT_TEST_CMP_USE_COPIED_CONTEXT
+endif
+
ifeq ($(TCLTK_PATH),)
NO_TCLTK=NoThanks
endif