Merge branch 'jc/mergetool-tool-help' into maint
* jc/mergetool-tool-help: mergetool: support --tool-help option like difftool does
Junio C Hamano committed
Aug 6, 2012 at 15:30 UTC
f52a386ef256fbea1618affd85cf62ad8283b2f7
No changes.