]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
git-mergetool--lib.sh patch | diff1 | diff2 | blob | history
t/t7610-mergetool.sh patch | diff1 | diff2 | blob | history

diff --cc git-mergetool--lib.sh
Simple merge
diff --cc t/t7610-mergetool.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.