Linux in a Nutshell, Fourth Edition

Name

sdiff

Synopsis

                  sdiff -o 
                  outfile [options] from to
               

Find differences between the two files from and to and merge interactively, writing the results to outfile.

Options

--

Treat remaining options as filenames, even if they begin with -.

-a, --text

Treat all files as text and compare line-by-line.

-b, --ignore-space-change

Ignore differences in whitespace.

-B, --ignore-blank-lines

Ignore added or missing blank lines.

-d, --minimal

Use a different algorithm to find fewer changes. This option causes sdiff to run more slowly.

-H, --speed-large-files

Heuristically speed comparison of large files with many small scattered changes.

-i, --ignore-case

Ignore case changes.

-I regexp, --ignore-matching-lines= regexp

Ignore any changes that insert or delete lines matching the regular expression regexp.

--ignore-all-space

Ignore whitespace when comparing lines.

-l, --left-column

Print only the left column of common lines.

-o file, --output= file

Write merged output to the specified file.

-s, --suppress-common-lines

Suppress common lines.

-t, --expand-tabs

Convert tabs to spaces in the output to preserve alignment.

-v, --version

Print version information and exit.

-w cols, --width= cols

Set the output to cols columns wide.

-W

Ignore horizontal whitespace when comparing lines.

Interactive commands

ed

Edit, then use both versions, with a header for each.

eb

Edit, then use both versions.

el

Edit, then use the left version.

er

Edit, then use the right version.

e

Edit a new version to replace the others. ...