Merge branch 'tr/mergetool-valgrind'

* tr/mergetool-valgrind:
  Symlink mergetools scriptlets into valgrind wrappers

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