mergetool: Skip autoresolved paths

diff --git a/t/Makefile b/t/Makefile
index 25c559bb49d04586c69242cd7ef03713f0939e9d..819b936870300fc8325c0f24f8c68ea8bdaa2727 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -3,6 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
+-include ../config.mak.autogen
 -include ../config.mak
 
 #GIT_TEST_OPTS=--verbose --debug
@@ -29,13 +30,16 @@ clean:
        $(RM) -r 'trash directory'.* test-results
        $(RM) t????/cvsroot/CVSROOT/?*
        $(RM) -r valgrind/bin
+       $(RM) .prove
 
 aggregate-results-and-cleanup: $(T)
        $(MAKE) aggregate-results
        $(MAKE) clean
 
 aggregate-results:
-       '$(SHELL_PATH_SQ)' ./aggregate-results.sh test-results/t*-*
+       for f in test-results/t*-*.counts; do \
+               echo "$$f"; \
+       done | '$(SHELL_PATH_SQ)' ./aggregate-results.sh
 
 # we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
 full-svn-test: