Merge branch 'tr/mergetool-valgrind'

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

Junio C Hamano committed Oct 5, 2011 at 12:35 UTC c4800a3b7731a4dc0274736403e8202ce3346f04

No changes.