diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-15 21:48:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-15 21:48:46 -0800 |
| commit | 073552d7ae5f34b93f9540787874c1ea0fff8051 (patch) | |
| tree | 5af2b3b0c07e4b841e7145bfdd6ad9e40e626833 /commit-graph.c | |
| parent | aa08688362448e0f74ed776449e80d54ca9ae909 (diff) | |
| parent | 80f5a16798b7ff224aeab4a6b6e3627446071345 (diff) | |
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
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions