| 1 | .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.27.
|
|---|
| 2 | .TH DIFF3 "1" "April 2002" "diffutils 2.8.1" "User Commands"
|
|---|
| 3 | .SH NAME
|
|---|
| 4 | diff3 \- compare three files line by line
|
|---|
| 5 | .SH SYNOPSIS
|
|---|
| 6 | .B diff3
|
|---|
| 7 | [\fIOPTION\fR]... \fIMYFILE OLDFILE YOURFILE\fR
|
|---|
| 8 | .SH DESCRIPTION
|
|---|
| 9 | Compare three files line by line.
|
|---|
| 10 | .TP
|
|---|
| 11 | \fB\-e\fR \fB\-\-ed\fR
|
|---|
| 12 | Output unmerged changes from OLDFILE to YOURFILE into MYFILE.
|
|---|
| 13 | .TP
|
|---|
| 14 | \fB\-E\fR \fB\-\-show\-overlap\fR
|
|---|
| 15 | Output unmerged changes, bracketing conflicts.
|
|---|
| 16 | .TP
|
|---|
| 17 | \fB\-A\fR \fB\-\-show\-all\fR
|
|---|
| 18 | Output all changes, bracketing conflicts.
|
|---|
| 19 | .TP
|
|---|
| 20 | \fB\-x\fR \fB\-\-overlap\-only\fR
|
|---|
| 21 | Output overlapping changes.
|
|---|
| 22 | .TP
|
|---|
| 23 | \fB\-X\fR
|
|---|
| 24 | Output overlapping changes, bracketing them.
|
|---|
| 25 | .TP
|
|---|
| 26 | \fB\-3\fR \fB\-\-easy\-only\fR
|
|---|
| 27 | Output unmerged nonoverlapping changes.
|
|---|
| 28 | .TP
|
|---|
| 29 | \fB\-m\fR \fB\-\-merge\fR
|
|---|
| 30 | Output merged file instead of ed script (default \fB\-A\fR).
|
|---|
| 31 | .TP
|
|---|
| 32 | \fB\-L\fR LABEL \fB\-\-label\fR=\fILABEL\fR
|
|---|
| 33 | Use LABEL instead of file name.
|
|---|
| 34 | .TP
|
|---|
| 35 | \fB\-i\fR
|
|---|
| 36 | Append `w' and `q' commands to ed scripts.
|
|---|
| 37 | .TP
|
|---|
| 38 | \fB\-a\fR \fB\-\-text\fR
|
|---|
| 39 | Treat all files as text.
|
|---|
| 40 | .TP
|
|---|
| 41 | \fB\-T\fR \fB\-\-initial\-tab\fR
|
|---|
| 42 | Make tabs line up by prepending a tab.
|
|---|
| 43 | .TP
|
|---|
| 44 | \fB\-\-diff\-program\fR=\fIPROGRAM\fR
|
|---|
| 45 | Use PROGRAM to compare files.
|
|---|
| 46 | .TP
|
|---|
| 47 | \fB\-v\fR \fB\-\-version\fR
|
|---|
| 48 | Output version info.
|
|---|
| 49 | .TP
|
|---|
| 50 | \fB\-\-help\fR
|
|---|
| 51 | Output this help.
|
|---|
| 52 | .PP
|
|---|
| 53 | If a FILE is `-', read standard input.
|
|---|
| 54 | .SH AUTHOR
|
|---|
| 55 | Written by Randy Smith.
|
|---|
| 56 | .SH "REPORTING BUGS"
|
|---|
| 57 | Report bugs to <bug-gnu-utils@gnu.org>.
|
|---|
| 58 | .SH COPYRIGHT
|
|---|
| 59 | Copyright \(co 2002 Free Software Foundation, Inc.
|
|---|
| 60 | .PP
|
|---|
| 61 | This program comes with NO WARRANTY, to the extent permitted by law.
|
|---|
| 62 | You may redistribute copies of this program
|
|---|
| 63 | under the terms of the GNU General Public License.
|
|---|
| 64 | For more information about these matters, see the file named COPYING.
|
|---|
| 65 | .SH "SEE ALSO"
|
|---|
| 66 | The full documentation for
|
|---|
| 67 | .B diff3
|
|---|
| 68 | is maintained as a Texinfo manual. If the
|
|---|
| 69 | .B info
|
|---|
| 70 | and
|
|---|
| 71 | .B diff3
|
|---|
| 72 | programs are properly installed at your site, the command
|
|---|
| 73 | .IP
|
|---|
| 74 | .B info diff
|
|---|
| 75 | .PP
|
|---|
| 76 | should give you access to the complete manual.
|
|---|
