carta
cut-diff(1)

cut-diff1

Show difference between 2 files with color

Usage

cut-diff [option ...] file1 file2

Overview

cut-diff is a diff command that uses diff feature in Cutter. It shows difference with color.

It's recommended that you use a normal diff(1) when you want to use with patch(1) or you don't need color.

Options

--version

cut-diff shows its own version and exits.

-c [yes|true|no|false|auto], --color=[yes|true|no|false|auto]

If 'yes' or 'true' is specified, cut-diff uses colorized output by escape sequence. If 'no' or 'false' is specified, cut-diff never use colorized output. If 'auto' or the option is omitted, cut-diff uses colorized output if available.

The default is auto.

-u, --unified

cut-diff uses unified diff format.

--context-lines=LINES

Shows diff context around LINES.

All lines are shown by default. When unified diff format is used, 3 lines are shown by default.

--label=LABEL, -L=LABEL

Uses LABEL as a header label. The first--label option value is used as file1's label and the second --label option value is used asfile2's label.

Labels are the same as file names by default.

Exit status

The exit status is 0 for success, non-0 otherwise.

TODO: 0 for non-difference, 1 for difference and non-0 for errors.

Examples

In the following example, cut-diff shows difference between file1 and file2:

    % cut-diff file1 file2

In the following example, cut-diff shows difference between file1 and file2 with unified diff format:

    % cut-diff -u file1 file2

History

  • Debian 7 (Wheezy): the text shown here
  • Debian 6.0 (Squeeze)

--context-lines since Debian 7 (Wheezy); --label since Debian 7 (Wheezy); -L since Debian 7 (Wheezy).

From cutter-testing-framework-bin 1.1.7-1.2 in Debian 7 (Wheezy). Parsed by carta from the page's man source.