From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 16 Jan 2021 05:48:46 +0000 (-0800)
Subject: Merge branch 'pb/mergetool-tool-help-fix'
X-Git-Tag: v2.31.0-rc0~122
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=073552d7ae5f34b93f9540787874c1ea0fff8051;p=thirdparty%2Fgit.git

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

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
---

073552d7ae5f34b93f9540787874c1ea0fff8051