projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aa08688 80f5a16)
Merge branch 'pb/mergetool-tool-help-fix'
authorJunio C Hamano <gitster@pobox.com>
Sat, 16 Jan 2021 05:48:46 +0000 (21:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 16 Jan 2021 05:48:46 +0000 (21:48 -0800)
commit073552d7ae5f34b93f9540787874c1ea0fff8051
tree5af2b3b0c07e4b841e7145bfdd6ad9e40e626833tree | snapshot
parentaa08688362448e0f74ed776449e80d54ca9ae909commit | diff
parent80f5a16798b7ff224aeab4a6b6e3627446071345commit | 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
git-mergetool--lib.sh diff1 | diff2 | blob | history
t/t7610-mergetool.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.