git.oblomov.eu Git - git/blob - mergetools/tortoisemerge

   1 can_diff () {
   2         return 1
   3 }
   4
   5 merge_cmd () {
   6         if $base_present
   7         then
   8                 touch "$BACKUP"
   9                 "$merge_tool_path" \
  10                         -base:"$BASE" -mine:"$LOCAL" \
  11                         -theirs:"$REMOTE" -merged:"$MERGED"
  12                 check_unchanged
  13         else
  14                 echo "$merge_tool_path cannot be used without a base" 1>&2
  15                 return 1
  16         fi
  17 }
  18
  19 translate_merge_tool_path() {
  20         if type tortoisegitmerge >/dev/null 2>/dev/null
  21         then
  22                 echo tortoisegitmerge
  23         else
  24                 echo tortoisemerge
  25         fi
  26 }