From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 6 Feb 2021 00:31:24 +0000 (-0800)
Subject: Merge branch 'pb/mergetool-tool-help-fix' into maint
X-Git-Tag: v2.30.1~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64971f0ac0200d3bb53cb19e7367cf57a40ae1fc;p=thirdparty%2Fgit.git

Merge branch 'pb/mergetool-tool-help-fix' into maint

Fix 2.29 regression where "git mergetool --tool-help" fails to list
all the available tools.

* pb/mergetool-tool-help-fix:
  mergetool--lib: fix '--tool-help' to correctly show available tools
---

64971f0ac0200d3bb53cb19e7367cf57a40ae1fc