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)
* jc/mergetool-tool-help:
  mergetool: support --tool-help option like difftool does


Trivial merge