mirror of
https://github.com/git/git.git
synced 2024-11-13 20:53:02 +01:00
17 lines
340 B
Text
17 lines
340 B
Text
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
touch "$BACKUP"
|
||
|
|
if $base_present
|
||
|
|
then
|
||
|
|
"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
|
||
|
|
--default --mode=merge3 --to="$MERGED"
|
||
|
|
else
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" \
|
||
|
|
--default --mode=merge2 --to="$MERGED"
|
||
|
|
fi
|
||
|
|
check_unchanged
|
||
|
|
}
|