mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
f13f9b0eab
Beyond Compare version 4 works the same way as version 3, so rename the existing "bc3" adaptor to just "bc", while keeping "bc3" as a backward compatible wrapper. Noticed-by: Olivier Croquette <ocroquette@free.fr> Helped-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
25 lines
401 B
Text
25 lines
401 B
Text
diff_cmd () {
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
|
}
|
|
|
|
merge_cmd () {
|
|
touch "$BACKUP"
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
|
|
-mergeoutput="$MERGED"
|
|
else
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" \
|
|
-mergeoutput="$MERGED"
|
|
fi
|
|
check_unchanged
|
|
}
|
|
|
|
translate_merge_tool_path() {
|
|
if type bcomp >/dev/null 2>/dev/null
|
|
then
|
|
echo bcomp
|
|
else
|
|
echo bcompare
|
|
fi
|
|
}
|