Git v2.29.0 includes patches that try to support Beyond Compare better by
default. However, as reported in
https://github.com/git-for-windows/git/issues/2893, they broke user-defined
setups that use bc4 as the name for the difftool.

This patch series fixes that and is based on pd/mergetool-nvimdiff.

Johannes Schindelin (2):
  mergetools/bc: add `bc4` to the alias list for Beyond Compare
  mergetool: avoid letting `list_tool_variants` break user-defined
    setups

 git-mergetool--lib.sh | 4 ++++
 mergetools/bc         | 1 +
 2 files changed, 5 insertions(+)

base-commit: 11868978c7c80d3c29071b29e7964e3d62523819

Submitted-As: https://lore.kernel.org/git/pull.787.git.1605126798.gitgitgadget@gmail.com