Merge branch 'maint-1.7.6' into maint

diff --git a/t/test-lib.sh b/t/test-lib.sh
index d7dfc8b0b1939180f16b8245e58465f883e85cbc..bdd9513b84301275330d3dd7e49af05081ef9cd7 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -950,6 +950,8 @@ then
        do
                make_valgrind_symlink $file
        done
+       # special-case the mergetools loadables
+       make_symlink "$GIT_BUILD_DIR"/mergetools "$GIT_VALGRIND/bin/mergetools"
        OLDIFS=$IFS
        IFS=:
        for path in $PATH