mirror of
https://github.com/git/git.git
synced 2024-11-02 07:17:58 +01:00
21 lines
392 B
Text
21 lines
392 B
Text
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
touch "$BACKUP"
|
||
|
|
if $base_present
|
||
|
|
then
|
||
|
|
"$merge_tool_path" -wait -merge -3 -a1 \
|
||
|
|
"$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
|
||
|
|
else
|
||
|
|
"$merge_tool_path" -wait -2 \
|
||
|
|
"$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
|
||
|
|
fi
|
||
|
|
check_unchanged
|
||
|
|
}
|
||
|
|
|
||
|
|
translate_merge_tool_path() {
|
||
|
|
echo compare
|
||
|
|
}
|