projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c4f050 ee0d7bf)
Merge branch 'tr/mergetool-valgrind' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 03:46:37 +0000 (20:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 03:46:37 +0000 (20:46 -0700)
* tr/mergetool-valgrind:
  Symlink mergetools scriptlets into valgrind wrappers

1  2 
t/test-lib.sh patch | diff1 | diff2 | blob | history

diff --cc t/test-lib.sh
Simple merge
Git—the stupid content tracker