From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 21 Nov 2020 23:14:39 +0000 (-0800)
Subject: Merge branch 'pd/mergetool-nvimdiff'
X-Git-Tag: v2.30.0-rc0~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d203add8925f4744f6bad6b84870988efe108262;p=thirdparty%2Fgit.git

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
---

d203add8925f4744f6bad6b84870988efe108262