tree 4d21d1a12b56d6b2896476d97861209b31faf688
parent 897d28bcc23878b5d98b46f3903e3d2a302d8a01
parent 80f5a16798b7ff224aeab4a6b6e3627446071345
author Junio C Hamano <gitster@pobox.com> 1612571484 -0800
committer Junio C Hamano <gitster@pobox.com> 1612571484 -0800

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