]> git.ipfire.org Git - thirdparty/git.git/commit - t/t4013/diff.log_-m_-p_master
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 897d28b 80f5a16)
Merge branch 'pb/mergetool-tool-help-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 6 Feb 2021 00:31:24 +0000 (16:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 6 Feb 2021 00:31:24 +0000 (16:31 -0800)
commit64971f0ac0200d3bb53cb19e7367cf57a40ae1fc
tree4d21d1a12b56d6b2896476d97861209b31faf688tree | snapshot
parent897d28bcc23878b5d98b46f3903e3d2a302d8a01commit | diff
parent80f5a16798b7ff224aeab4a6b6e3627446071345commit | diff
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
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.