mergetools/opendiff

   1 diff_cmd () {
   2         "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
   3 }
   4
   5 diff_cmd_help () {
   6         echo "Use FileMerge (requires a graphical session)"
   7 }
   8
   9 merge_cmd () {
  10         if $base_present
  11         then
  12                 "$merge_tool_path" "$LOCAL" "$REMOTE" \
  13                         -ancestor "$BASE" -merge "$MERGED" | cat
  14         else
  15                 "$merge_tool_path" "$LOCAL" "$REMOTE" \
  16                         -merge "$MERGED" | cat
  17         fi
  18 }
  19
  20 merge_cmd_help () {
  21         echo "Use FileMerge (requires a graphical session)"
  22 }