Print this page
4213 Missing spaces in man pages
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/man/man1/diff3.1
+++ new/usr/src/man/man1/diff3.1
1 1 '\" te
2 2 .\" Copyright 1989 AT&T Copyright (c) 2005, Sun Microsystems, Inc. All Rights Reserved
3 3 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License.
4 4 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License.
5 5 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
6 6 .TH DIFF3 1 "Nov 7, 2005"
7 7 .SH NAME
8 8 diff3 \- 3-way differential file comparison
9 9 .SH SYNOPSIS
10 10 .LP
11 11 .nf
12 12 \fBdiff3\fR [\fB-exEX3\fR] \fIfilename1\fR \fIfilename2\fR \fIfilename3\fR
13 13 .fi
14 14
15 15 .SH DESCRIPTION
16 16 .sp
17 17 .LP
18 18 \fBdiff3\fR compares three versions of a file. It publishes disagreeing ranges
19 19 of text flagged with the following codes:
20 20 .sp
21 21 .ne 2
22 22 .na
23 23 \fB\fB====\fR\fR
24 24 .ad
|
↓ open down ↓ |
24 lines elided |
↑ open up ↑ |
25 25 .RS 9n
26 26 all three files differ
27 27 .RE
28 28
29 29 .sp
30 30 .ne 2
31 31 .na
32 32 \fB\fB====1\fR\fR
33 33 .ad
34 34 .RS 9n
35 -\fIfilename1\fRis different
35 +\fIfilename1\fR is different
36 36 .RE
37 37
38 38 .sp
39 39 .ne 2
40 40 .na
41 41 \fB\fB====2\fR\fR
42 42 .ad
43 43 .RS 9n
44 -\fIfilename2\fRis different
44 +\fIfilename2\fR is different
45 45 .RE
46 46
47 47 .sp
48 48 .ne 2
49 49 .na
50 50 \fB\fB====3\fR\fR
51 51 .ad
52 52 .RS 9n
53 -\fIfilename3\fRis different
53 +\fIfilename3\fR is different
54 54 .RE
55 55
56 56 .sp
57 57 .LP
58 58 The type of change suffered in converting a given range of a given file to some
59 59 other is indicated in one of the following ways:
60 60 .sp
61 61 .ne 2
62 62 .na
63 63 \fB\fIf\fR\fB : \fR\fIn1\fR\fB a\fR\fR
64 64 .ad
65 65 .RS 17n
66 66 Text is to be appended after line number \fIn1\fR in file \fIf\fR, where
67 67 \fIf\fR = 1, 2, or 3.
68 68 .RE
69 69
70 70 .sp
71 71 .ne 2
72 72 .na
73 73 \fB\fIf\fR\fB : \fR\fIn1\fR\fB , \fR\fIn2\fR\fB c\fR\fR
74 74 .ad
75 75 .RS 17n
76 76 Text is to be changed in the range line \fIn1\fR to line \fIn2\fR. If \fIn1\fR
77 77 = \fIn\fR2, the range can be abbreviated to \fIn1\fR.
78 78 .RE
79 79
80 80 .sp
81 81 .LP
82 82 The original contents of the range follows immediately after a \fBc\fR
83 83 indication. When the contents of two files are identical, the contents of the
84 84 lower-numbered file is suppressed.
85 85 .sp
86 86 .LP
87 87 The following command applies the resulting script to \fIfilename1\fR.
88 88 .sp
89 89 .in +2
90 90 .nf
91 91 \fB(cat script; echo a\'1,$pa\') | ed \(mi \fR\fIfilename1\fR
92 92 .fi
93 93 .in -2
94 94 .sp
95 95
96 96 .SH OPTIONS
97 97 .sp
98 98 .LP
99 99 The following options are supported:
100 100 .sp
101 101 .ne 2
102 102 .na
103 103 \fB\fB-e\fR \fR
104 104 .ad
105 105 .RS 7n
106 106 Produce a script for the \fBed\fR(1) editor that incorporates into
107 107 \fIfilename1\fR all changes between \fIfilename2\fR and \fIfilename3\fR (that
108 108 is, the changes that normally would be flagged \fB====\fR and \fB====3\fR).
109 109 .sp
110 110 Text lines that consist of a single dot (\fB\&.\fR defeat the \fB-e\fR option.
111 111 .RE
112 112
113 113 .sp
114 114 .ne 2
115 115 .na
116 116 \fB\fB-E\fR \fR
117 117 .ad
118 118 .RS 7n
119 119 Produce a script that incorporates all changes between \fIfilename2\fR and
120 120 \fIfilename3\fR, but treat overlapping changes (that is, changes that would be
121 121 flagged with \fB====\fR in the normal listing) differently. The overlapping
122 122 lines from both files are inserted by the edit script, bracketed by
123 123 \fB<<<<<<\fR and \fB>>>>>>\fR lines.
124 124 .RE
125 125
126 126 .sp
127 127 .ne 2
128 128 .na
129 129 \fB\fB-x\fR \fR
130 130 .ad
131 131 .RS 7n
132 132 Produce a script to incorporate only changes flagged \fB====\fR.
133 133 .RE
134 134
135 135 .sp
136 136 .ne 2
137 137 .na
138 138 \fB\fB-X\fR \fR
139 139 .ad
140 140 .RS 7n
141 141 Produce a script that incorporates only changes flagged \fB====\fR, but treat
142 142 these changes in the manner of the \fB-E\fR option.
143 143 .RE
144 144
145 145 .sp
146 146 .ne 2
147 147 .na
148 148 \fB\fB-3\fR \fR
149 149 .ad
150 150 .RS 7n
151 151 Produce a script to incorporate only changes flagged \fB====3\fR.
152 152 .RE
153 153
154 154 .SH USAGE
155 155 .sp
156 156 .LP
157 157 See \fBlargefile\fR(5) for the description of the behavior of \fBdiff3\fR when
158 158 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
159 159 .SH FILES
160 160 .sp
161 161 .ne 2
162 162 .na
163 163 \fB\fB/tmp/d3*\fR \fR
164 164 .ad
165 165 .RS 23n
166 166
167 167 .RE
168 168
169 169 .sp
170 170 .ne 2
171 171 .na
172 172 \fB\fB/usr/lib/diff3prog\fR \fR
173 173 .ad
174 174 .RS 23n
175 175
176 176 .RE
177 177
178 178 .SH EXIT STATUS
179 179 .sp
180 180 .LP
181 181 The following exit values are returned:
182 182 .sp
183 183 .ne 2
184 184 .na
185 185 \fB\fB0\fR \fR
186 186 .ad
187 187 .RS 6n
188 188 Successful completion.
189 189 .RE
190 190
191 191 .sp
192 192 .ne 2
193 193 .na
194 194 \fB\fB1\fR\fR
195 195 .ad
196 196 .RS 6n
197 197 An error occurred. A difference was found or there was a fatal error.
198 198 .RE
199 199
200 200 .sp
201 201 .ne 2
202 202 .na
203 203 \fB\fB>1\fR\fR
204 204 .ad
205 205 .RS 6n
206 206 A fatal error occurred.
207 207 .RE
208 208
209 209 .sp
210 210 .LP
211 211 Return values do not work the same as \fBdiff\fR(1) or other vendor's versions
212 212 of \fBdiff3\fR.
213 213 .SH ATTRIBUTES
214 214 .sp
215 215 .LP
216 216 See \fBattributes\fR(5) for descriptions of the following attributes:
217 217 .sp
218 218
219 219 .sp
220 220 .TS
221 221 box;
222 222 c | c
223 223 l | l .
224 224 ATTRIBUTE TYPE ATTRIBUTE VALUE
225 225 _
226 226 CSI Enabled
227 227 .TE
228 228
229 229 .SH SEE ALSO
230 230 .sp
231 231 .LP
232 232 \fBdiff\fR(1), \fBattributes\fR(5), \fBlargefile\fR(5)
233 233 .SH NOTES
234 234 .sp
235 235 .LP
236 236 Files longer than 64 Kbytes do not work.
|
↓ open down ↓ |
173 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX