Code

Merge branch 'tr/mergetool-valgrind'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:35:53 +0000 (12:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:35:53 +0000 (12:35 -0700)
* tr/mergetool-valgrind:
  Symlink mergetools scriptlets into valgrind wrappers

1  2 
t/test-lib.sh

diff --cc t/test-lib.sh
Simple merge