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.
|
|
|
can_diff () {
|
|
|
|
return 1
|
|
|
|
}
|
|
|
|
|
|
|
|
merge_cmd () {
|
|
|
|
if $base_present
|
|
|
|
then
|
|
|
|
touch "$BACKUP"
|
|
|
|
basename="$(basename "$merge_tool_path" .exe)"
|
|
|
|
if test "$basename" = "tortoisegitmerge"
|
|
|
|
then
|
|
|
|
"$merge_tool_path" \
|
|
|
|
-base "$BASE" -mine "$LOCAL" \
|
|
|
|
-theirs "$REMOTE" -merged "$MERGED"
|
|
|
|
else
|
|
|
|
"$merge_tool_path" \
|
|
|
|
-base:"$BASE" -mine:"$LOCAL" \
|
|
|
|
-theirs:"$REMOTE" -merged:"$MERGED"
|
|
|
|
fi
|
|
|
|
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
|
|
|
|
}
|