[ < ] | [ > ] | [ << ] | [ Up ] | [ >> ] | [Top] | [Contents] | [Index] | [ ? ] |
sdiff
The sdiff
command merges two files and interactively outputs the
results. Its arguments are as follows:
sdiff -o outfile options… from-file to-file |
This merges from-file with to-file, with output to outfile.
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.
An exit status of 0 means no differences were found, 1 means some differences were found, and 2 means trouble.
sdiff
without ‘-o’ (or ‘--output’) produces a
side-by-side difference. This usage is obsolete; use ‘diff
--side-by-side’ instead.
15.1 Options to sdiff | Summary of options to diff .
|
[ < ] | [ > ] | [ << ] | [ Up ] | [ >> ] | [Top] | [Contents] | [Index] | [ ? ] |
sdiff
Below is a summary of all of the options that GNU sdiff
accepts.
Each option has two equivalent names, one of which is a single
letter preceded by ‘-’, and the other of which is a long name
preceded by ‘--’. Multiple single letter options (unless they take
an argument) can be combined into a single command line argument. Long
named options can be abbreviated to any unique prefix of their name.
Treat all files as text and compare them line-by-line, even if they do not appear to be text. See section Binary Files and Forcing Text Comparisons.
Ignore changes in amount of white space. See section Suppressing Differences in Blank and Tab Spacing.
Ignore changes that just insert or delete blank lines. See section Suppressing Differences in Blank Lines.
Change the algorithm to perhaps find a smaller set of changes. This
makes sdiff
slower (sometimes much slower). See section diff
Performance Tradeoffs.
Use PROGRAM to compare files.
Ignore changes due to tab expansion.
Use heuristics to speed handling of large files that have numerous
scattered small changes. See section diff
Performance Tradeoffs.
Ignore changes in case; consider upper- and lower-case to be the same. See section Suppressing Case Differences.
Ignore changes that just insert or delete lines that match regexp. See section Suppressing Lines Matching a Regular Expression.
Print only the left column of two common lines. See section Controlling Side by Side Format.
Put merged output into file. This option is required for merging.
Do not print common lines. See section Controlling Side by Side Format.
Strip trailing carriage return on input.
Expand tabs to spaces in the output, to preserve the alignment of tabs in the input files. See section Preserving Tabstop Alignment.
Output the version number of sdiff
.
Use an output width of columns. See section Controlling Side by Side Format.
Note that for historical reasons, this option is ‘-W’ in diff
,
‘-w’ in sdiff
.
Ignore horizontal white space when comparing lines. See section Suppressing Differences in Blank and Tab Spacing.
Note that for historical reasons, this option is ‘-w’ in diff
,
‘-W’ in sdiff
.
[ << ] | [ >> ] | [Top] | [Contents] | [Index] | [ ? ] |
This document was generated by Santiago Vila on November 4, 2009 using texi2html 1.82.