You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
19 lines
263 B
19 lines
263 B
7 years ago
|
diff_cmd () {
|
||
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
||
|
|
}
|
||
|
|
|
||
|
|
merge_cmd () {
|
||
|
|
if $base_present
|
||
|
|
then
|
||
|
|
"$merge_tool_path" -s "$LOCAL" \
|
||
|
|
"$REMOTE" "$BASE" "$MERGED"
|
||
|
|
else
|
||
|
|
"$merge_tool_path" -m "$LOCAL" \
|
||
|
|
"$REMOTE" "$MERGED"
|
||
|
|
fi
|
||
|
|
}
|
||
|
|
|
||
|
|
exit_code_trustable () {
|
||
|
|
true
|
||
|
|
}
|