git/mergetools/bc3

28 lines
398 B
Plaintext
Raw Normal View History

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() {
case $(uname -s) in
*MINGW*)
echo bcomp
;;
*)
echo bcompare
;;
esac
}