11 lines
191 B
Plaintext
11 lines
191 B
Plaintext
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
touch "$BACKUP"
|
||
|
|
$base_present || >"$BASE"
|
||
|
|
"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
|
||
|
|
check_unchanged
|
||
|
|
}
|