Merge branch 'tr/mergetool-valgrind' into maint
commit8f858299b585e4be0648432a78a94b0260b3ad86
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 03:46:37 +0000 (15 20:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 03:46:37 +0000 (15 20:46 -0700)
tree45190cf2d0e0109fdf6126fde597512b9eff2d88
parent7c4f050ae1e140a81f66b5cf92ad2c8673cfda8b
parentee0d7bf92507f7c968736a490813e8d9cd7792b1
Merge branch 'tr/mergetool-valgrind' into maint

* tr/mergetool-valgrind:
  Symlink mergetools scriptlets into valgrind wrappers
t/test-lib.sh