mergetools/tortoisemerge

   1 can_diff () {
   2         return 1
   3 }
   4
   5 diff_cmd_help () {
   6         echo "Use TortoiseMerge (requires a graphical session)"
   7 }
   8
   9 merge_cmd () {
  10         if $base_present
  11         then
  12                 basename="$(basename "$merge_tool_path" .exe)"
  13                 if test "$basename" = "tortoisegitmerge"
  14                 then
  15                         "$merge_tool_path" \
  16                                 -base "$BASE" -mine "$LOCAL" \
  17                                 -theirs "$REMOTE" -merged "$MERGED"
  18                 else
  19                         "$merge_tool_path" \
  20                                 -base:"$BASE" -mine:"$LOCAL" \
  21                                 -theirs:"$REMOTE" -merged:"$MERGED"
  22                 fi
  23         else
  24                 echo "$merge_tool_path cannot be used without a base" 1>&2
  25                 return 1
  26         fi
  27 }
  28
  29 translate_merge_tool_path() {
  30         if type tortoisegitmerge >/dev/null 2>/dev/null
  31         then
  32                 echo tortoisegitmerge
  33         else
  34                 echo tortoisemerge
  35         fi
  36 }
  37
  38 merge_cmd_help () {
  39         echo "Use TortoiseMerge (requires a graphical session)"
  40 }