]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'pd/mergetool-nvimdiff'
authorJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2020 23:14:39 +0000 (15:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2020 23:14:39 +0000 (15:14 -0800)
commitd203add8925f4744f6bad6b84870988efe108262
tree80b6ddacb7b46e4cba649882b2b9c76882826bd0
parentc7942b91dc1575f2dd5710cfdef1355be993f657
parent12026f46e73ba09b8c403079bccc72a3b85e8dc9
Merge branch 'pd/mergetool-nvimdiff'

Fix regression introduced when nvimdiff support in mergetool was added.

* pd/mergetool-nvimdiff:
  mergetool: avoid letting `list_tool_variants` break user-defined setups
  mergetools/bc: add `bc4` to the alias list for Beyond Compare