Andrew's git - gitweb.git/blob - mergetools/diffuse

   1diff_cmd () {
   2        "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
   3}
   4
   5merge_cmd () {
   6        touch "$BACKUP"
   7        if $base_present
   8        then
   9                "$merge_tool_path" \
  10                        "$LOCAL" "$MERGED" "$REMOTE" \
  11                        "$BASE" | cat
  12        else
  13                "$merge_tool_path" \
  14                        "$LOCAL" "$MERGED" "$REMOTE" | cat
  15        fi
  16        check_unchanged
  17}