t6021: add a new test for git-merge-resolve

diff --git a/perl/Makefile b/perl/Makefile
index 0d695fd2f35f91b47455dc382d86b52bb51088d2..5e079ad01126845c39fd9583fa742f54d5658b49 100644 (file)
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -40,4 +40,3 @@ endif
 # (even though GIT-CFLAGS aren't used yet. If ever)
 ../GIT-CFLAGS:
        $(MAKE) -C .. GIT-CFLAGS
-