-
- sdiff - find differences between two files and merge interactively
-
- diff [ options ] from-file to-file
-
- The sdiff command merges two files and interactively outputs the results.
- 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 without --output produces a side-by-side difference. This usage is obsolete; use diff --side-by-side instead.
-
- -o, --output=file
- Output interactively, sending output to file. This option is required for merging.
- -a, --text|ascii
- Treat all files as text and compare them line-by-line, even if they do not appear to be text.
- -i, --ignore-case
- Consider upper- and lower-case to be the same.
- -W, --ignore-all-space
- Ignore all white space. For historical reasons this option is -w in diff(1).
- -b, --ignore-space-change
- Ignore changes in the amount of white space.
- -B, --ignore-blank-lines
- Ignore changes whose lines are all blank.
- -I, --ignore-matching-lines=pattern
- Ignore changes whose lines all match the regular expression pattern.
- -w, --width=columns
- Output at most columns 130) characters per line. For historical reasons this option is -w in diff(1).
The default value is 130.
- -l, --left-column
- Output only the left column of common lines.
- -s, --suppress-common-lines
- Do not output common lines.
- -t, --expand-tabs
- Expand tabs to spaces in output.
- -d, --minimal
- Try hard to find a smaller set of changes.
- -H, --speed-large-files
- Assume large files and many scattered small changes.
- -v
- Print the program version and exit.
-
- 0
- No differences were found.
- 1
- Some differences were found.
- 2
- An error occurred.
-
- cmp(1), comm(1), diff(1),
diff3(1), ed(1), patch(1)
-
- version
- sdiff (GNU diffutils 2.7) 1994-10-01
- author
- Thomas Lord
- copyright
- Copyright © 1992-2008 AT&T Intellectual Property
- license
- http://www.opensource.org/licenses/gpl1.0.txt