Skip to content

Commit 0e2b11a

Browse files
committed
mergetools/bc: add bc4 to the alias list for Beyond Compare
As of 83bbf9b (mergetool--lib: improve support for vimdiff-style tool variants, 2020-07-29), we already list `bc` and `bc3` as aliases for that mergetool/difftool. However, the current Beyond Compare version is _4_, therefore the `bc4` alias is missing from that list. Most notably, this is the root cause of the breakage reported in #2893 where a well-configured `bc4` difftool stopped working as of v2.29.0: `setup_tool` would notice that after stripping off the trailing digit, it finds a match in `mergetools/` (the `bc` file), source it, and then the alias would not match the list offered by the `list_tool_variants` function, and simply exit without doing anything, but pretending success. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 1186897 commit 0e2b11a

File tree

1 file changed

+1
-0
lines changed
  • mergetools

1 file changed

+1
-0
lines changed

mergetools/bc

+1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ translate_merge_tool_path() {
2525
list_tool_variants () {
2626
echo bc
2727
echo bc3
28+
echo bc4
2829
}

0 commit comments

Comments
 (0)