15 lines
267 B
Text
15 lines
267 B
Text
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
if $base_present
|
||
|
|
then
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" \
|
||
|
|
-ancestor "$BASE" -merge "$MERGED" | cat
|
||
|
|
else
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" \
|
||
|
|
-merge "$MERGED" | cat
|
||
|
|
fi
|
||
|
|
}
|