Name

sdiff

Synopsis

sdiff [options] file1 file2
                  

Compares two files to find differences and interactively merges them. Without the -o option, sdiff behaves like diff-side-by-side.

Options

-a, --text

Treat all files as text files. Useful for checking to see if binary files are identical.

-b, --ignore-space-change

Ignore repeating blanks and end-of-line blanks; treat successive blanks as one.

-B, --ignore-blank-lines

Ignore blank lines in files.

-d, --minimal

Ignore segments of numerous changes and output a smaller set of changes.

-H

Speed output of large files by scanning for scattered small changes; long stretches with many changes may not show up.

--help

Print brief usage message.

-i, --ignore-case

Ignore case in text comparison. Upper- and lowercase are considered the same.

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

Ignore lines in files that match the regular expression regexp.

-l, --left-column

For two-column output (-y), show only left column of common lines.

-s, --suppress-common-lines

For two-column output (-y), don’t show common lines.

-t, --expand-tabs

Produce output with tabs expanded to spaces to line up tabs properly in output.

-v, --version

Print version number of this version of sdiff.

-W, --ignore-all-space

Ignore all whitespace in files for comparisons.

-w n, --width= n

For two-column output (-y), produce columns with a maximum width of n characters. Default is 130.

-o outfile

Send identical lines of file1 and file2 to outfile; print line differences and edit outfile ...

Get Mac OS X Panther in a Nutshell, 2nd Edition now with O’Reilly online learning.

O’Reilly members experience live online training, plus books, videos, and digital content from 200+ publishers.