1 .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.39.2.
2 .TH DIFF3 "1" "September 2011" "diffutils 3.2" "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 Mandatory arguments to long options are mandatory for short options too.
13 \fB\-A\fR, \fB\-\-show\-all\fR
14 output all changes, bracketing conflicts
16 \fB\-e\fR, \fB\-\-ed\fR
17 output ed script incorporating changes
18 from OLDFILE to YOURFILE into MYFILE
20 \fB\-E\fR, \fB\-\-show\-overlap\fR
21 like \fB\-e\fR, but bracket conflicts
23 \fB\-3\fR, \fB\-\-easy\-only\fR
24 like \fB\-e\fR, but incorporate only nonoverlapping changes
26 \fB\-x\fR, \fB\-\-overlap\-only\fR
27 like \fB\-e\fR, but incorporate only overlapping changes
30 like \fB\-x\fR, but bracket conflicts
33 append `w' and `q' commands to ed scripts
35 \fB\-m\fR, \fB\-\-merge\fR
36 output actual merged file, according to
37 \fB\-A\fR if no other options are given
39 \fB\-a\fR, \fB\-\-text\fR
40 treat all files as text
42 \fB\-\-strip\-trailing\-cr\fR
43 strip trailing carriage return on input
45 \fB\-T\fR, \fB\-\-initial\-tab\fR
46 make tabs line up by prepending a tab
48 \fB\-\-diff\-program\fR=\fIPROGRAM\fR
49 use PROGRAM to compare files
51 \fB\-L\fR, \fB\-\-label\fR=\fILABEL\fR
52 use LABEL instead of file name
53 (can be repeated up to three times)
56 display this help and exit
58 \fB\-v\fR, \fB\-\-version\fR
59 output version information and exit
61 The default output format is a somewhat human\-readable representation of
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.
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
71 If a FILE is `\-', read standard input.
72 Exit status is 0 if successful, 1 if conflicts, 2 if trouble.
74 Written by Randy Smith.
76 Report bugs to: bug\-diffutils@gnu.org
78 GNU diffutils home page: <http://www.gnu.org/software/diffutils/>
80 General help using GNU software: <http://www.gnu.org/gethelp/>
82 Copyright \(co 2011 Free Software Foundation, Inc.
83 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
85 This is free software: you are free to change and redistribute it.
86 There is NO WARRANTY, to the extent permitted by law.
88 cmp(1), diff(1), sdiff(1)
90 The full documentation for
92 is maintained as a Texinfo manual. If the
96 programs are properly installed at your site, the command
100 should give you access to the complete manual.