Merge branch 'jc/combine-diff-many-parents' into maint

diff --git a/t/test-lib.sh b/t/test-lib.sh
index fc42d3a9c4f7e0bf98b657826163a04f2905f366..ea1e4a03a7b61392c0a068cb55006165e9a7394a 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -86,7 +86,7 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
                PROVE
                VALGRIND
                UNZIP
-               PERF_AGGREGATING_LATER
+               PERF_
        ));
        my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
        print join("\n", @vars);