summaryrefslogtreecommitdiff
path: root/t/t5515/refs.main_.._.git_one
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-01-15 21:48:46 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-15 21:48:46 -0800
commit073552d7ae5f34b93f9540787874c1ea0fff8051 (patch)
tree5af2b3b0c07e4b841e7145bfdd6ad9e40e626833 /t/t5515/refs.main_.._.git_one
parentMerge branch 'ds/for-each-repo-noopfix' (diff)
parentmergetool--lib: fix '--tool-help' to correctly show available tools (diff)
downloadtgif-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 't/t5515/refs.main_.._.git_one')
0 files changed, 0 insertions, 0 deletions