mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-25 11:37:56 +00:00
91 lines
2.4 KiB
Groff
91 lines
2.4 KiB
Groff
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
|
|
.TH SDIFF "1" "April 2004" "diffutils 2.8.7" "User Commands"
|
|
.SH NAME
|
|
sdiff \- side-by-side merge of file differences
|
|
.SH SYNOPSIS
|
|
.B sdiff
|
|
[\fIOPTION\fR]... \fIFILE1 FILE2\fR
|
|
.SH DESCRIPTION
|
|
Side-by-side merge of file differences.
|
|
.TP
|
|
\fB\-o\fR FILE \fB\-\-output\fR=\fIFILE\fR
|
|
Operate interactively, sending output to FILE.
|
|
.TP
|
|
\fB\-i\fR \fB\-\-ignore\-case\fR
|
|
Consider upper- and lower-case to be the same.
|
|
.TP
|
|
\fB\-E\fR \fB\-\-ignore\-tab\-expansion\fR
|
|
Ignore changes due to tab expansion.
|
|
.TP
|
|
\fB\-b\fR \fB\-\-ignore\-space\-change\fR
|
|
Ignore changes in the amount of white space.
|
|
.TP
|
|
\fB\-W\fR \fB\-\-ignore\-all\-space\fR
|
|
Ignore all white space.
|
|
.TP
|
|
\fB\-B\fR \fB\-\-ignore\-blank\-lines\fR
|
|
Ignore changes whose lines are all blank.
|
|
.TP
|
|
\fB\-I\fR RE \fB\-\-ignore\-matching\-lines\fR=\fIRE\fR
|
|
Ignore changes whose lines all match RE.
|
|
.TP
|
|
\fB\-\-strip\-trailing\-cr\fR
|
|
Strip trailing carriage return on input.
|
|
.TP
|
|
\fB\-a\fR \fB\-\-text\fR
|
|
Treat all files as text.
|
|
.TP
|
|
\fB\-w\fR NUM \fB\-\-width\fR=\fINUM\fR
|
|
Output at most NUM (default 130) print columns.
|
|
.TP
|
|
\fB\-l\fR \fB\-\-left\-column\fR
|
|
Output only the left column of common lines.
|
|
.TP
|
|
\fB\-s\fR \fB\-\-suppress\-common\-lines\fR
|
|
Do not output common lines.
|
|
.TP
|
|
\fB\-t\fR \fB\-\-expand\-tabs\fR
|
|
Expand tabs to spaces in output.
|
|
.TP
|
|
\fB\-\-tabsize\fR=\fINUM\fR
|
|
Tab stops are every NUM (default 8) print columns.
|
|
.TP
|
|
\fB\-d\fR \fB\-\-minimal\fR
|
|
Try hard to find a smaller set of changes.
|
|
.TP
|
|
\fB\-H\fR \fB\-\-speed\-large\-files\fR
|
|
Assume large files and many scattered small changes.
|
|
.TP
|
|
\fB\-\-diff\-program\fR=\fIPROGRAM\fR
|
|
Use PROGRAM to compare files.
|
|
.TP
|
|
\fB\-v\fR \fB\-\-version\fR
|
|
Output version info.
|
|
.TP
|
|
\fB\-\-help\fR
|
|
Output this help.
|
|
.PP
|
|
If a FILE is `-', read standard input.
|
|
Exit status is 0 if inputs are the same, 1 if different, 2 if trouble.
|
|
.SH AUTHOR
|
|
Written by Thomas Lord.
|
|
.SH "REPORTING BUGS"
|
|
Report bugs to <bug-gnu-utils@gnu.org>.
|
|
.SH COPYRIGHT
|
|
Copyright \(co 2004 Free Software Foundation, Inc.
|
|
.br
|
|
This is free software; see the source for copying conditions. There is NO
|
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
.SH "SEE ALSO"
|
|
The full documentation for
|
|
.B sdiff
|
|
is maintained as a Texinfo manual. If the
|
|
.B info
|
|
and
|
|
.B sdiff
|
|
programs are properly installed at your site, the command
|
|
.IP
|
|
.B info diff
|
|
.PP
|
|
should give you access to the complete manual.
|