Fall back to three-way merge when applying a patch.

diff --git a/t/Makefile b/t/Makefile
index 198c5eda7c76f2059ce96ad471cd059cb27867f9..e71da7782ecce282a2c0098cc1d10d2171a5a954 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -2,14 +2,16 @@
 #
 # Copyright (c) 2005 Junio C Hamano
 #
-#OPTS=--verbose --debug
-OPTS=
+
+#GIT_TEST_OPTS=--verbose --debug
+SHELL_PATH ?= $(SHELL)
+TAR ?= $(TAR)
 
 T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
 
-all::
-       @$(foreach t,$T,echo "*** $t ***"; sh $t $(OPTS) || exit; )
-       rm -fr trash
+all:
+       @$(foreach t,$T,echo "*** $t ***"; $(SHELL_PATH) $t $(GIT_TEST_OPTS) || exit; )
+       @rm -fr trash
 
-clean::
+clean:
        rm -fr trash