| 1 |
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. |
| 2 |
.TH DIFF3 "1" "April 2025" "diffutils 3.12" "User Commands" |
| 3 |
.SH NAME |
| 4 |
diff3 \- compare three files line by line |
| 5 |
.SH SYNOPSIS |
| 6 |
.B diff3 |
| 7 |
[\fI\,OPTION\/\fR]... \fI\,MYFILE OLDFILE YOURFILE\/\fR |
| 8 |
.SH DESCRIPTION |
| 9 |
Compare three files line by line. |
| 10 |
.PP |
| 11 |
Mandatory arguments to long options are mandatory for short options too. |
| 12 |
.TP |
| 13 |
\fB\-A\fR, \fB\-\-show\-all\fR |
| 14 |
output all changes, bracketing conflicts |
| 15 |
.TP |
| 16 |
\fB\-e\fR, \fB\-\-ed\fR |
| 17 |
output ed script incorporating changes |
| 18 |
from OLDFILE to YOURFILE into MYFILE |
| 19 |
.TP |
| 20 |
\fB\-E\fR, \fB\-\-show\-overlap\fR |
| 21 |
like \fB\-e\fR, but bracket conflicts |
| 22 |
.TP |
| 23 |
\fB\-3\fR, \fB\-\-easy\-only\fR |
| 24 |
like \fB\-e\fR, but incorporate only nonoverlapping changes |
| 25 |
.TP |
| 26 |
\fB\-x\fR, \fB\-\-overlap\-only\fR |
| 27 |
like \fB\-e\fR, but incorporate only overlapping changes |
| 28 |
.TP |
| 29 |
\fB\-X\fR |
| 30 |
like \fB\-x\fR, but bracket conflicts |
| 31 |
.TP |
| 32 |
\fB\-i\fR |
| 33 |
append 'w' and 'q' commands to ed scripts |
| 34 |
.TP |
| 35 |
\fB\-m\fR, \fB\-\-merge\fR |
| 36 |
output actual merged file, according to |
| 37 |
\fB\-A\fR if no other options are given |
| 38 |
.TP |
| 39 |
\fB\-a\fR, \fB\-\-text\fR |
| 40 |
treat all files as text |
| 41 |
.TP |
| 42 |
\fB\-\-strip\-trailing\-cr\fR |
| 43 |
strip trailing carriage return on input |
| 44 |
.TP |
| 45 |
\fB\-T\fR, \fB\-\-initial\-tab\fR |
| 46 |
make tabs line up by prepending a tab |
| 47 |
.TP |
| 48 |
\fB\-\-diff\-program\fR=\fI\,PROGRAM\/\fR |
| 49 |
use PROGRAM to compare files |
| 50 |
.TP |
| 51 |
\fB\-L\fR, \fB\-\-label\fR=\fI\,LABEL\/\fR |
| 52 |
use LABEL instead of file name |
| 53 |
(can be repeated up to three times) |
| 54 |
.TP |
| 55 |
\fB\-\-help\fR |
| 56 |
display this help and exit |
| 57 |
.TP |
| 58 |
\fB\-v\fR, \fB\-\-version\fR |
| 59 |
output version information and exit |
| 60 |
.PP |
| 61 |
The default output format is a somewhat human\-readable representation of |
| 62 |
the changes. |
| 63 |
.PP |
| 64 |
The \fB\-e\fR, \fB\-E\fR, \fB\-x\fR, \fB\-X\fR (and corresponding long) options cause an ed script |
| 65 |
to be output instead of the default. |
| 66 |
.PP |
| 67 |
Finally, the \fB\-m\fR (\fB\-\-merge\fR) option causes diff3 to do the merge internally |
| 68 |
and output the actual merged file. For unusual input, this is more |
| 69 |
robust than using ed. |
| 70 |
.PP |
| 71 |
If a FILE is '\-', read standard input. |
| 72 |
Exit status is 0 if successful, 1 if conflicts, 2 if trouble. |
| 73 |
.SH AUTHOR |
| 74 |
Written by Randy Smith. |
| 75 |
.SH "REPORTING BUGS" |
| 76 |
Report bugs to: bug\[email protected] |
| 77 |
.br |
| 78 |
GNU diffutils home page: <https://www.gnu.org/software/diffutils/> |
| 79 |
.br |
| 80 |
General help using GNU software: <https://www.gnu.org/gethelp/> |
| 81 |
.SH COPYRIGHT |
| 82 |
Copyright \(co 2025 Free Software Foundation, Inc. |
| 83 |
License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>. |
| 84 |
.br |
| 85 |
This is free software: you are free to change and redistribute it. |
| 86 |
There is NO WARRANTY, to the extent permitted by law. |
| 87 |
.SH "SEE ALSO" |
| 88 |
.BR cmp (1), |
| 89 |
.BR diff (1), |
| 90 |
.BR sdiff (1) |
| 91 |
.PP |
| 92 |
The full documentation for |
| 93 |
.B diff3 |
| 94 |
is maintained as a Texinfo manual. If the |
| 95 |
.B info |
| 96 |
and |
| 97 |
.B diff3 |
| 98 |
programs are properly installed at your site, the command |
| 99 |
.IP |
| 100 |
.B info diff3 |
| 101 |
.PP |
| 102 |
should give you access to the complete manual. |