diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:35:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:35:53 -0700 |
| commit | c4800a3b7731a4dc0274736403e8202ce3346f04 (patch) | |
| tree | e864296135830ce3895c20fc770cfa6810aff2c6 /t/test-lib.sh | |
| parent | 00723b02912cc9dae1ee5601ab4b942fdd42ff52 (diff) | |
| parent | ee0d7bf92507f7c968736a490813e8d9cd7792b1 (diff) | |
| download | git-c4800a3b7731a4dc0274736403e8202ce3346f04.tar.gz | |
Merge branch 'tr/mergetool-valgrind'
* tr/mergetool-valgrind:
Symlink mergetools scriptlets into valgrind wrappers
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index d7dfc8b0b1..bdd9513b84 100644 --- 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 |