2012-08-10 10:21:06 +02:00
|
|
|
diff_cmd () {
|
|
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
|
|
|
}
|
|
|
|
|
2022-03-30 21:19:09 +02:00
|
|
|
diff_cmd_help () {
|
|
|
|
echo "Use Code Compare (requires a graphical session)"
|
|
|
|
}
|
|
|
|
|
2012-08-10 10:21:06 +02:00
|
|
|
merge_cmd () {
|
|
|
|
if $base_present
|
|
|
|
then
|
|
|
|
"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
|
|
|
|
-RF="$MERGED"
|
|
|
|
else
|
|
|
|
"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
|
|
|
|
-RF="$MERGED"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2022-03-30 21:19:09 +02:00
|
|
|
merge_cmd_help () {
|
|
|
|
echo "Use Code Compare (requires a graphical session)"
|
|
|
|
}
|
|
|
|
|
2012-08-10 10:21:06 +02:00
|
|
|
translate_merge_tool_path() {
|
|
|
|
if merge_mode
|
|
|
|
then
|
|
|
|
echo CodeMerge
|
|
|
|
else
|
|
|
|
echo CodeCompare
|
|
|
|
fi
|
|
|
|
}
|