Skip to content

difftool: fix user-defined Beyond Compare setups

Johannes Schindelin via GitGitGadget git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2mergetools/bc: add `bc4` to the alias list for Beyond Comparemergetools/bc+1 -00 replies
2/2mergetool: avoid letting `list_tool_variants` break user-defined setupsgit-mergetool--lib.sh+4 -01 reply

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/2] difftool: fix user-defined Beyond Compare setups

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
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-787%2Fdscho%2Ffix-beyond-compare-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-787/dscho/fix-beyond-compare-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/787

Signature · 1 line
gitgitgadget

Read the cover letter in its thread