From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Oct 2011 03:46:37 +0000 (-0700)
Subject: Merge branch 'tr/mergetool-valgrind' into maint
X-Git-Tag: v1.7.7.1~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8f858299b585e4be0648432a78a94b0260b3ad86;p=git.git

Merge branch 'tr/mergetool-valgrind' into maint

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

8f858299b585e4be0648432a78a94b0260b3ad86