Junio C Hamano 64971f0ac0 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

2021-02-05 16:31:24 -08:00

9.5 KiB

Raw Blame History

View Raw