Penguin
Recent Changes
Annotated edit history of diff3(1) version 1, including all changes. View license author blame.
Rev Author # Line
1 perry 1 DIFF3
2 !!!DIFF3
3 NAME
4 SYNOPSIS
5 DESCRIPTION
6 SEE ALSO
7 DIAGNOSTICS
8 ----
9 !!NAME
10
11
12 diff3 - find differences between three files
13 !!SYNOPSIS
14
15
16 __diff3__ [[options] mine older yours
17 !!DESCRIPTION
18
19
20 The ''diff3'' command compares three files and outputs
21 descriptions of their differences.
22
23
24 The files to compare are ''mine'', ''older'', and
25 ''yours''. At most one of these three file names may be
26 __-__, which tells ''diff3'' to read the standard
27 input for that file.
28
29
30 __Options__
31
32
33 Below is a summary of all of the options that GNU
34 ''diff3'' accepts. Multiple single letter options (unless
35 they take an argument) can be combined into a single command
36 line argument.
37
38
39 __-a__
40
41
42 Treat all files as text and compare them line-by-line, even
43 if they do not appear to be text.
44
45
46 __-A__
47
48
49 Incorporate all changes from ''older'' to ''yours''
50 into ''mine'', surrounding all conflicts with bracket
51 lines.
52
53
54 __-B__
55
56
57 Old behavior of -A. Shows non-conflicts.
58
59
60 __-e__
61
62
63 Generate an ''ed'' script that incorporates all the
64 changes from ''older'' to ''yours'' into
65 ''mine''.
66
67
68 __-E__
69
70
71 Like __-e__, except bracket lines from overlapping
72 changes' first and third files. With __-e__, an
73 overlapping change looks like this:
74
75
76 mine
77 ''lines from ''mine
78 ''=======
79 lines from ''yours
80 ''''yours
81 ''
82
83
84 __--ed__
85
86
87 Generate an ''ed'' script that incorporates all the
88 changes from ''older'' to ''yours'' into
89 ''mine''.
90
91
92 __--easy-only__
93
94
95 Like __-e__, except output only the nonoverlapping
96 changes.
97
98
99 __-i__
100
101
102 Generate __w__ and __q__ commands at the end of the
103 ''ed'' script for System V compatibility. This option
104 must be combined with one of the __-AeExX3__ options, and
105 may not be combined with __-m__.
106
107
108 __--initial-tab__
109
110
111 Output a tab rather than two spaces before the text of a
112 line in normal format. This causes the alignment of tabs in
113 the line to look normal.
114
115
116 __-L__ ''label''
117
118
119 __--label=__''label''
120
121
122 Use the label ''label'' for the brackets output by the
123 __-A__, __-E__ and __-X__ options. This option may
124 be given up to three times, one for each input file. The
125 default labels are the names of the input files. Thus
126 __diff3 -L X -L Y -L Z -m A B C__ acts like __diff3 -m A
127 B C ,__ except that the output looks like it came from
128 files named __X__, __Y__ and __Z__ rather than from
129 files named __A__, __B__ and __C__.
130
131
132 __-m__
133
134
135 __--merge__
136
137
138 Apply the edit script to the first file and send the result
139 to standard output. Unlike piping the output from
140 ''diff3'' to ''ed'', this works even for binary files
141 and incomplete lines. __-A__ is assumed if no edit script
142 option is specified.
143
144
145 __--overlap-only__
146
147
148 Like __-e__, except output only the overlapping
149 changes.
150
151
152 __--show-all__
153
154
155 Incorporate all unmerged changes from ''older'' to
156 ''yours'' into ''mine'', surrounding all overlapping
157 changes with bracket lines.
158
159
160 __--show-overlap__
161
162
163 Like __-e__, except bracket lines from overlapping
164 changes' first and third files.
165
166
167 __-T__
168
169
170 Output a tab rather than two spaces before the text of a
171 line in normal format. This causes the alignment of tabs in
172 the line to look normal.
173
174
175 __--text__
176
177
178 Treat all files as text and compare them line-by-line, even
179 if they do not appear to be text.
180
181
182 __-v__
183
184
185 __--version__
186
187
188 Output the version number of ''diff3''.
189
190
191 __-x__
192
193
194 Like __-e__, except output only the overlapping
195 changes.
196
197
198 __-X__
199
200
201 Like __-E__, except output only the overlapping changes.
202 In other words, like __-x__, except bracket changes as in
203 __-E__.
204
205
206 __-3__
207
208
209 Like __-e__, except output only the nonoverlapping
210 changes.
211 !!SEE ALSO
212
213
214 cmp(1), comm(1), diff(1), ed(1), patch(1),
215 sdiff(1).
216 !!DIAGNOSTICS
217
218
219 An exit status of 0 means ''diff3'' was successful, 1
220 means some conflicts were found, and 2 means
221 trouble.
222 ----
This page is a man page (or other imported legacy content). We are unable to automatically determine the license status of this page.