sdiff: Merge two files interactively

Merge two files interactively. (Show differences) with output
to outfile.
SYNTAX
sdiff -o outfile [options] from-file to-file

OPTIONS

Multiple single letter options (unless they take an argument)
can be combined into a single command line argument.

-a Treat all files as text and compare them line-by-line,
even if they do not appear to be text.

-b Ignore changes in amount of white space.

-B Ignore changes that just insert or delete blank
lines.

-d Change the algorithm to perhaps find a smaller set
of changes. This makes sdiff slower (sometimes
much slower).

-H Use heuristics to speed handling of large files
that have numerous scattered small changes.

--expand-tabs

Expand tabs to spaces in the output, to preserve
the alignment of tabs in the input files.

-i Ignore changes in case; consider upper- and lower-
case to be the same.

-I regexp
Ignore changes that just insert or delete lines
that match regexp.

--ignore-all-space
Ignore white space when comparing lines.

--ignore-blank-lines

Ignore changes that just insert or delete blank
lines.

--ignore-case
Ignore changes in case; consider upper- and lower-
case to be the same.

--ignore-matching-lines=regexp
Ignore changes that just insert or delete lines
that match regexp.

--ignore-space-change
Ignore changes in amount of white space.

-l

--left-column
Print only the left column of two common lines.

--minimal
Change the algorithm to perhaps find a smaller set
of changes. This makes sdiff slower (sometimes
much slower).

-o file
--output=file

Put merged output into file. This option is
required for merging.

-s
--suppress-common-lines
Do not print common lines.

--speed-large-files
Use heuristics to speed handling of large files
that have numerous scattered small changes.

-t Expand tabs to spaces in the output, to preserve
the alignment of tabs in the input files.

--text Treat all files as text and compare them line-by-
line, even if they do not appear to be text.

-v

--version
Output the version number of sdiff.

-w columns
--width=columns
Use an output width of columns. Note that for his-
torical reasons, this option is -W in diff, -w in
sdiff.

-W Ignore horizontal white space when comparing lines.
Note that for historical reasons, this option is -w

in diff, -W in sdiff.
Long named options can be abbreviated to any unique prefix of
their name.
If from-file is a directory and to-file is not,
sdiff compares the file in from-file whose file name is that of
to-file, and vice versa. from-file and to-file may not
both be directories.
sdiff options begin with -, so normally from-file
and to-file may not begin with -. However, -- as
an argument by itself treats the remaining arguments as file names even if they
begin with -.
You may not use - as an input file.
sdiff without -o (or --output) produces a
side-by-side difference. This usage is obsolete; use diff --side-by-side
instead.
An exit status of 0 means no differences were found, 1 means some
differences were found, and 2 means trouble.
"Eventually, all things merge into one, and a river runs through it" - Norman Maclean
Tags
Comments
Write the first comment
Leave a trace
Name *
Email *
Website
Anti SPAM * Code (6 + 9) =
Leave me a comment *
 
All comments are subject to editorial review
Post being viewed right now
Item date: 04.02.2009
Views: 830
Item date: 03.12.2010
Views: 583
Item date: 27.09.2009
Views: 1804
Item date: 06.02.2009
Views: 695
Item date: 23.08.2009
Views: 1951
Item date: 10.04.2009
Views: 566
Item date: 07.03.2009
Views: 1432
Item date: 02.01.2009
Views: 714
Item date: 13.05.2009
Views: 1467