can_diff () {
return 1
}
merge_cmd () {
if $base_present
then
basename="$(basename "$merge_tool_path" .exe)"
if test "$basename" = "tortoisegitmerge"
"$merge_tool_path" \
-base "$BASE" -mine "$LOCAL" \
-theirs "$REMOTE" -merged "$MERGED"
else
-base:"$BASE" -mine:"$LOCAL" \
-theirs:"$REMOTE" -merged:"$MERGED"
fi
echo "$merge_tool_path cannot be used without a base" 1>&2
translate_merge_tool_path() {
if type tortoisegitmerge >/dev/null 2>/dev/null
echo tortoisegitmerge
echo tortoisemerge