2014-10-20 22:49:36 +00:00
|
|
|
diff_cmd () {
|
|
|
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
merge_cmd () {
|
|
|
|
|
if $base_present
|
|
|
|
|
then
|
|
|
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
|
|
|
|
|
-mergeoutput="$MERGED"
|
|
|
|
|
else
|
|
|
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" \
|
|
|
|
|
-mergeoutput="$MERGED"
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
translate_merge_tool_path() {
|
|
|
|
|
if type bcomp >/dev/null 2>/dev/null
|
|
|
|
|
then
|
|
|
|
|
echo bcomp
|
|
|
|
|
else
|
|
|
|
|
echo bcompare
|
|
|
|
|
fi
|
|
|
|
|
}
|
2020-07-29 21:31:12 +00:00
|
|
|
|
|
|
|
|
list_tool_variants () {
|
|
|
|
|
echo bc
|
|
|
|
|
echo bc3
|
mergetools/bc: add `bc4` to the alias list for Beyond Compare
As of 83bbf9b92ea8 (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
https://github.com/git-for-windows/git/issues/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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-11 20:33:17 +00:00
|
|
|
echo bc4
|
2020-07-29 21:31:12 +00:00
|
|
|
}
|
