merge script: --squash, --ff from unborn branch are errors

diff --git a/t/test-lib.sh b/t/test-lib.sh
index db8371cb170c5924512a5626681f485ea3cf6884..e5523dd690a43fdcf315e7e952d4d316182eeb25 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -636,7 +636,7 @@ test_done () {
        GIT_EXIT_OK=t
        test_results_dir="$TEST_DIRECTORY/test-results"
        mkdir -p "$test_results_dir"
-       test_results_path="$test_results_dir/${0%.sh}-$$"
+       test_results_path="$test_results_dir/${0%.sh}-$$.counts"
 
        echo "total $test_count" >> $test_results_path
        echo "success $test_success" >> $test_results_path