mirror of
https://github.com/git/git.git
synced 2024-10-02 13:31:22 +02:00
17 lines
301 B
Plaintext
17 lines
301 B
Plaintext
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
touch "$BACKUP"
|
||
|
|
if $base_present
|
||
|
|
then
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" \
|
||
|
|
-ancestor "$BASE" -merge "$MERGED" | cat
|
||
|
|
else
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" \
|
||
|
|
-merge "$MERGED" | cat
|
||
|
|
fi
|
||
|
|
check_unchanged
|
||
|
|
}
|