8 basename="$(basename "$merge_tool_path" .exe)"
9 if test "$basename" = "tortoisegitmerge"
12 -base "$BASE" -mine "$LOCAL" \
13 -theirs "$REMOTE" -merged "$MERGED"
16 -base:"$BASE" -mine:"$LOCAL" \
17 -theirs:"$REMOTE" -merged:"$MERGED"
20 echo "$merge_tool_path cannot be used without a base" 1>&2
25 translate_merge_tool_path() {
26 if type tortoisegitmerge >/dev/null 2>/dev/null