mergetools/opendiff

   1 diff_cmd () {
   2         "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
   3 }
   4
   5 merge_cmd () {
   6         if $base_present
   7         then
   8                 "$merge_tool_path" "$LOCAL" "$REMOTE" \
   9                         -ancestor "$BASE" -merge "$MERGED" | cat
  10         else
  11                 "$merge_tool_path" "$LOCAL" "$REMOTE" \
  12                         -merge "$MERGED" | cat
  13         fi
  14 }