From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jul 2012 21:05:26 +0000 (-0700)
Subject: Merge branch 'jc/mergetool-tool-help'
X-Git-Tag: v1.7.12-rc1~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cf7864837c12c396ad5927cb6c0bbaa790cda7ad;p=git.git

Merge branch 'jc/mergetool-tool-help'

"git mergetool" did not support --tool-help option to give the list
of supported backends, like "git difftool" does.

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

cf7864837c12c396ad5927cb6c0bbaa790cda7ad