From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Oct 2011 19:35:53 +0000 (-0700)
Subject: Merge branch 'tr/mergetool-valgrind'
X-Git-Tag: v1.7.8-rc0~153
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c4800a3b7731a4dc0274736403e8202ce3346f04;p=git.git

Merge branch 'tr/mergetool-valgrind'

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

c4800a3b7731a4dc0274736403e8202ce3346f04