diff options
author | Junio C Hamano <junkio@cox.net> | 2006-11-20 09:49:31 +0100 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-11-22 05:55:39 +0100 |
commit | 7cdbff14d4823c3a3d64c2011ab0b23f794efef8 (patch) | |
tree | 14d84fbaf70277d8ba833391c03860e98c1defe7 /t/Makefile | |
parent | Doc: Make comment about merging in tutorial.txt more clear (diff) | |
download | git-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.tar.xz git-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.zip |
remove merge-recursive-old
This frees the Porcelain-ish that comes with the core Python-free.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/Makefile')
-rw-r--r-- | t/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/t/Makefile b/t/Makefile index 89835093fb..e1c6c92d9c 100644 --- a/t/Makefile +++ b/t/Makefile @@ -13,10 +13,6 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh) TSVN = $(wildcard t91[0-9][0-9]-*.sh) -ifdef NO_PYTHON - GIT_TEST_OPTS += --no-python -endif - all: $(T) clean $(T): |