Merge branch 'jc/mergetool-tool-help' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:30:18 +0000 (15:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:30:18 +0000 (15:30 -0700)
commitf52a386ef256fbea1618affd85cf62ad8283b2f7
tree05751e940605bdf0b26b47e92e01f1cb93ecc55b
parent0e4c8822e98e27c3c63125570c8bcbf0a8fd34da
parent109859e27445a3ad12eb8f8cba43a5aa8f701733
Merge branch 'jc/mergetool-tool-help' into maint

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