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 /trailer.c | |
parent | Merge branch 'ds/for-each-repo-noopfix' (diff) | |
parent | mergetool--lib: fix '--tool-help' to correctly show available tools (diff) | |
download | tgif-073552d7ae5f34b93f9540787874c1ea0fff8051.tar.xz |
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 'trailer.c')
0 files changed, 0 insertions, 0 deletions