mirror of
https://github.com/git/git.git
synced 2024-11-16 14:04:52 +01:00
11 lines
191 B
Text
11 lines
191 B
Text
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
touch "$BACKUP"
|
||
|
|
$base_present || >"$BASE"
|
||
|
|
"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
|
||
|
|
check_unchanged
|
||
|
|
}
|