1 .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
2 .TH DIFF3 "1" "April 2010" "diffutils 2.9.19-4065" "User Commands"
4 diff3 \- compare three files line by line
7 [\fIOPTION\fR]... \fIMYFILE OLDFILE YOURFILE\fR
9 Compare three files line by line.
11 \fB\-e\fR \fB\-\-ed\fR
12 Output unmerged changes from OLDFILE to YOURFILE into MYFILE.
14 \fB\-E\fR \fB\-\-show\-overlap\fR
15 Output unmerged changes, bracketing conflicts.
17 \fB\-A\fR \fB\-\-show\-all\fR
18 Output all changes, bracketing conflicts.
20 \fB\-x\fR \fB\-\-overlap\-only\fR
21 Output overlapping changes.
24 Output overlapping changes, bracketing them.
26 \fB\-3\fR \fB\-\-easy\-only\fR
27 Output unmerged nonoverlapping changes.
29 \fB\-m\fR \fB\-\-merge\fR
30 Output merged file instead of ed script (default \fB\-A\fR).
32 \fB\-L\fR LABEL \fB\-\-label\fR=\fILABEL\fR
33 Use LABEL instead of file name.
36 Append `w' and `q' commands to ed scripts.
38 \fB\-a\fR \fB\-\-text\fR
39 Treat all files as text.
41 \fB\-\-strip\-trailing\-cr\fR
42 Strip trailing carriage return on input.
44 \fB\-T\fR \fB\-\-initial\-tab\fR
45 Make tabs line up by prepending a tab.
47 \fB\-\-diff\-program\fR=\fIPROGRAM\fR
48 Use PROGRAM to compare files.
50 \fB\-v\fR \fB\-\-version\fR
56 If a FILE is `\-', read standard input.
57 Exit status is 0 if successful, 1 if conflicts, 2 if trouble.
59 Written by Randy Smith.
61 Report bugs to: bug\-diffutils@gnu.org
62 GNU diffutils home page: <http://www.gnu.org/software/diffutils/>
63 General help using GNU software: <http://www.gnu.org/gethelp/>
65 Copyright \(co 2010 Free Software Foundation, Inc.
66 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
68 This is free software: you are free to change and redistribute it.
69 There is NO WARRANTY, to the extent permitted by law.
71 The full documentation for
73 is maintained as a Texinfo manual. If the
77 programs are properly installed at your site, the command
81 should give you access to the complete manual.