26 lines
425 B
26 lines
425 B
can_diff () { |
|
return 1 |
|
} |
|
|
|
merge_cmd () { |
|
if $base_present |
|
then |
|
touch "$BACKUP" |
|
"$merge_tool_path" \ |
|
-base:"$BASE" -mine:"$LOCAL" \ |
|
-theirs:"$REMOTE" -merged:"$MERGED" |
|
check_unchanged |
|
else |
|
echo "$merge_tool_path cannot be used without a base" 1>&2 |
|
return 1 |
|
fi |
|
} |
|
|
|
translate_merge_tool_path() { |
|
if type tortoisegitmerge >/dev/null 2>/dev/null |
|
then |
|
echo tortoisegitmerge |
|
else |
|
echo tortoisemerge |
|
fi |
|
}
|
|
|