New test case: merge with directory/file conflicts

diff --git a/t/Makefile b/t/Makefile
index 5c76afff83087ee4d6324699f7ba376c18201716..5c5a62012673eaa7eec76da0068606bc78311fbd 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -15,9 +15,14 @@ shellquote = '$(call shq,$(1))'
 
 T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
 
-all:
-       @$(foreach t,$T,echo "*** $t ***"; $(call shellquote,$(SHELL_PATH)) $t $(GIT_TEST_OPTS) || exit; )
-       @rm -fr trash
+all: $(T) clean
+
+$(T):
+       @echo "*** $@ ***"; $(call shellquote,$(SHELL_PATH)) $@ $(GIT_TEST_OPTS)
 
 clean:
        rm -fr trash
+
+.PHONY: $(T) clean
+.NOPARALLEL:
+