From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Aug 2012 22:30:18 +0000 (-0700)
Subject: Merge branch 'jc/mergetool-tool-help' into maint
X-Git-Tag: v1.7.12-rc2~2^2~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f52a386ef256fbea1618affd85cf62ad8283b2f7

Merge branch 'jc/mergetool-tool-help' into maint

* jc/mergetool-tool-help:
mergetool: support --tool-help option like difftool does
---

f52a386ef256fbea1618affd85cf62ad8283b2f7