|
Packit |
33f14e |
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4.
|
|
Packit |
33f14e |
.TH DIFF3 "1" "May 2017" "diffutils 3.6" "User Commands"
|
|
Packit |
33f14e |
.SH NAME
|
|
Packit |
33f14e |
diff3 \- compare three files line by line
|
|
Packit |
33f14e |
.SH SYNOPSIS
|
|
Packit |
33f14e |
.B diff3
|
|
Packit |
33f14e |
[\fIOPTION\fR]... \fIMYFILE OLDFILE YOURFILE\fR
|
|
Packit |
33f14e |
.SH DESCRIPTION
|
|
Packit |
33f14e |
Compare three files line by line.
|
|
Packit |
33f14e |
.PP
|
|
Packit |
33f14e |
Mandatory arguments to long options are mandatory for short options too.
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-A\fR, \fB\-\-show\-all\fR
|
|
Packit |
33f14e |
output all changes, bracketing conflicts
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-e\fR, \fB\-\-ed\fR
|
|
Packit |
33f14e |
output ed script incorporating changes
|
|
Packit |
33f14e |
from OLDFILE to YOURFILE into MYFILE
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-E\fR, \fB\-\-show\-overlap\fR
|
|
Packit |
33f14e |
like \fB\-e\fR, but bracket conflicts
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-3\fR, \fB\-\-easy\-only\fR
|
|
Packit |
33f14e |
like \fB\-e\fR, but incorporate only nonoverlapping changes
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-x\fR, \fB\-\-overlap\-only\fR
|
|
Packit |
33f14e |
like \fB\-e\fR, but incorporate only overlapping changes
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-X\fR
|
|
Packit |
33f14e |
like \fB\-x\fR, but bracket conflicts
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-i\fR
|
|
Packit |
33f14e |
append 'w' and 'q' commands to ed scripts
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-m\fR, \fB\-\-merge\fR
|
|
Packit |
33f14e |
output actual merged file, according to
|
|
Packit |
33f14e |
\fB\-A\fR if no other options are given
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-a\fR, \fB\-\-text\fR
|
|
Packit |
33f14e |
treat all files as text
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-\-strip\-trailing\-cr\fR
|
|
Packit |
33f14e |
strip trailing carriage return on input
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-T\fR, \fB\-\-initial\-tab\fR
|
|
Packit |
33f14e |
make tabs line up by prepending a tab
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-\-diff\-program\fR=\fIPROGRAM\fR
|
|
Packit |
33f14e |
use PROGRAM to compare files
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-L\fR, \fB\-\-label\fR=\fILABEL\fR
|
|
Packit |
33f14e |
use LABEL instead of file name
|
|
Packit |
33f14e |
(can be repeated up to three times)
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-\-help\fR
|
|
Packit |
33f14e |
display this help and exit
|
|
Packit |
33f14e |
.TP
|
|
Packit |
33f14e |
\fB\-v\fR, \fB\-\-version\fR
|
|
Packit |
33f14e |
output version information and exit
|
|
Packit |
33f14e |
.PP
|
|
Packit |
33f14e |
The default output format is a somewhat human\-readable representation of
|
|
Packit |
33f14e |
the changes.
|
|
Packit |
33f14e |
.PP
|
|
Packit |
33f14e |
The \fB\-e\fR, \fB\-E\fR, \fB\-x\fR, \fB\-X\fR (and corresponding long) options cause an ed script
|
|
Packit |
33f14e |
to be output instead of the default.
|
|
Packit |
33f14e |
.PP
|
|
Packit |
33f14e |
Finally, the \fB\-m\fR (\fB\-\-merge\fR) option causes diff3 to do the merge internally
|
|
Packit |
33f14e |
and output the actual merged file. For unusual input, this is more
|
|
Packit |
33f14e |
robust than using ed.
|
|
Packit |
33f14e |
.PP
|
|
Packit |
33f14e |
If a FILE is '\-', read standard input.
|
|
Packit |
33f14e |
Exit status is 0 if successful, 1 if conflicts, 2 if trouble.
|
|
Packit |
33f14e |
.SH AUTHOR
|
|
Packit |
33f14e |
Written by Randy Smith.
|
|
Packit |
33f14e |
.SH "REPORTING BUGS"
|
|
Packit |
33f14e |
Report bugs to: bug\-diffutils@gnu.org
|
|
Packit |
33f14e |
.br
|
|
Packit |
33f14e |
GNU diffutils home page: <http://www.gnu.org/software/diffutils/>
|
|
Packit |
33f14e |
.br
|
|
Packit |
33f14e |
General help using GNU software: <http://www.gnu.org/gethelp/>
|
|
Packit |
33f14e |
.SH COPYRIGHT
|
|
Packit |
33f14e |
Copyright \(co 2017 Free Software Foundation, Inc.
|
|
Packit |
33f14e |
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
|
|
Packit |
33f14e |
.br
|
|
Packit |
33f14e |
This is free software: you are free to change and redistribute it.
|
|
Packit |
33f14e |
There is NO WARRANTY, to the extent permitted by law.
|
|
Packit |
33f14e |
.SH "SEE ALSO"
|
|
Packit |
33f14e |
cmp(1), diff(1), sdiff(1)
|
|
Packit |
33f14e |
.PP
|
|
Packit |
33f14e |
The full documentation for
|
|
Packit |
33f14e |
.B diff3
|
|
Packit |
33f14e |
is maintained as a Texinfo manual. If the
|
|
Packit |
33f14e |
.B info
|
|
Packit |
33f14e |
and
|
|
Packit |
33f14e |
.B diff3
|
|
Packit |
33f14e |
programs are properly installed at your site, the command
|
|
Packit |
33f14e |
.IP
|
|
Packit |
33f14e |
.B info diff3
|
|
Packit |
33f14e |
.PP
|
|
Packit |
33f14e |
should give you access to the complete manual.
|