1 .TH DIFF3 1 "22sep1993" "GNU Tools" "GNU Tools"
3 diff3 \- find differences between three files
6 [options] mine older yours
10 command compares three files and outputs descriptions
13 The files to compare are
18 At most one of these three file names may be
22 to read the standard input for that file.
24 Below is a summary of all of the options that GNU
26 accepts. Multiple single letter options (unless they take an argument)
27 can be combined into a single command line argument.
30 Treat all files as text and compare them line-by-line, even if they
31 do not appear to be text.
34 Incorporate all changes from
40 surrounding all conflicts with bracket lines.
43 Old behavior of -A. Shows non-conflicts.
48 script that incorporates all the changes from
58 except bracket lines from overlapping changes' first
62 an overlapping change looks like this:
68 lines from \fIyours\fP
75 script that incorporates all the changes from
85 except output only the nonoverlapping changes.
92 commands at the end of the
94 script for System V compatibility. This option must be combined with
97 options, and may not be combined with
101 Output a tab rather than two spaces before the text of a line in normal format.
102 This causes the alignment of tabs in the line to look normal.
110 for the brackets output by the
115 options. This option may be given up to three
116 times, one for each input file. The default labels are the names of
117 the input files. Thus
118 .B "diff3 \-L X \-L Y \-L Z \-m A B C"
120 .BR "diff3 \-m A B C ,
121 except that the output looks like it came from
127 rather than from files
139 Apply the edit script to the first file and send the result to standard
140 output. Unlike piping the output from
145 works even for binary files and incomplete lines.
148 if no edit script option is specified.
153 except output only the overlapping changes.
156 Incorporate all unmerged changes from
162 surrounding all overlapping changes with bracket lines.
167 except bracket lines from overlapping changes' first
171 Output a tab rather than two spaces before the text of a line in normal format.
172 This causes the alignment of tabs in the line to look normal.
175 Treat all files as text and compare them line-by-line, even if they
176 do not appear to be text.
183 Output the version number of
189 except output only the overlapping changes.
194 except output only the overlapping changes.
197 except bracket changes as in
203 except output only the nonoverlapping changes.
205 cmp(1), comm(1), diff(1), ed(1), patch(1), sdiff(1).
207 An exit status of 0 means
209 was successful, 1 means some
210 conflicts were found, and 2 means trouble.