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)
commitc4800a3b7731a4dc0274736403e8202ce3346f04
treee864296135830ce3895c20fc770cfa6810aff2c6
parent00723b02912cc9dae1ee5601ab4b942fdd42ff52
parentee0d7bf92507f7c968736a490813e8d9cd7792b1
Merge branch 'tr/mergetool-valgrind'

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