You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
18 lines
282 B
18 lines
282 B
14 years ago
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
touch "$BACKUP"
|
||
|
|
if $base_present
|
||
|
|
then
|
||
|
|
"$merge_tool_path" \
|
||
|
|
"$LOCAL" "$MERGED" "$REMOTE" \
|
||
|
|
"$BASE" | cat
|
||
|
|
else
|
||
|
|
"$merge_tool_path" \
|
||
|
|
"$LOCAL" "$MERGED" "$REMOTE" | cat
|
||
|
|
fi
|
||
|
|
check_unchanged
|
||
|
|
}
|