23 lines
353 B
23 lines
353 B
diff_cmd () { |
|
"$merge_tool_path" "$LOCAL" "$REMOTE" |
|
} |
|
|
|
merge_cmd () { |
|
if $base_present |
|
then |
|
"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \ |
|
-RF="$MERGED" |
|
else |
|
"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \ |
|
-RF="$MERGED" |
|
fi |
|
} |
|
|
|
translate_merge_tool_path() { |
|
if merge_mode |
|
then |
|
echo CodeMerge |
|
else |
|
echo CodeCompare |
|
fi |
|
}
|
|
|