]>
Commit | Line | Data |
---|---|---|
64efbbaa | 1 | diff -Nru diffutils-2.7/man/cmp.1 diffutils-2.7.new/man/cmp.1 |
2 | --- diffutils-2.7/man/cmp.1 Thu Jan 1 01:00:00 1970 | |
3 | +++ diffutils-2.7.new/man/cmp.1 Sun Mar 21 14:45:00 1999 | |
4 | @@ -0,0 +1,107 @@ | |
5 | +.\" Copyright (c) 1987, 1990, 1993 | |
6 | +.\" The Regents of the University of California. All rights reserved. | |
7 | +.\" | |
8 | +.\" This code is derived from software contributed to Berkeley by | |
9 | +.\" the Institute of Electrical and Electronics Engineers, Inc. | |
10 | +.\" | |
11 | +.\" Redistribution and use in source and binary forms, with or without | |
12 | +.\" modification, are permitted provided that the following conditions | |
13 | +.\" are met: | |
14 | +.\" 1. Redistributions of source code must retain the above copyright | |
15 | +.\" notice, this list of conditions and the following disclaimer. | |
16 | +.\" 2. Redistributions in binary form must reproduce the above copyright | |
17 | +.\" notice, this list of conditions and the following disclaimer in the | |
18 | +.\" documentation and/or other materials provided with the distribution. | |
19 | +.\" 3. All advertising materials mentioning features or use of this software | |
20 | +.\" must display the following acknowledgement: | |
21 | +.\" This product includes software developed by the University of | |
22 | +.\" California, Berkeley and its contributors. | |
23 | +.\" 4. Neither the name of the University nor the names of its contributors | |
24 | +.\" may be used to endorse or promote products derived from this software | |
25 | +.\" without specific prior written permission. | |
26 | +.\" | |
27 | +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | |
28 | +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
29 | +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |
30 | +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | |
31 | +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | |
32 | +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |
33 | +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |
34 | +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | |
35 | +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
36 | +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
37 | +.\" SUCH DAMAGE. | |
38 | +.\" | |
39 | +.\" @(#)cmp.1 8.1 (Berkeley) 6/6/93 | |
40 | +.\" | |
41 | +.Dd June 6, 1993 | |
42 | +.Dt CMP 1 | |
43 | +.Os | |
44 | +.Sh NAME | |
45 | +.Nm cmp | |
46 | +.Nd compare two files | |
47 | +.Sh SYNOPSIS | |
48 | +.Nm cmp | |
49 | +.Op Fl l | Fl s | |
50 | +.Ar file1 file2 | |
51 | +.Op Ar skip1 Op Ar skip2 | |
52 | +.Sh DESCRIPTION | |
53 | +The cmp utility compares two files of any type and writes the results | |
54 | +to the standard output. | |
55 | +By default, | |
56 | +.Nm | |
57 | +is silent if the files are the same; if they differ, the byte | |
58 | +and line number at which the first difference occurred is reported. | |
59 | +.Pp | |
60 | +Bytes and lines are numbered beginning with one. | |
61 | +.Pp | |
62 | +The following options are available: | |
63 | +.Bl -tag -width flag | |
64 | +.It Fl l | |
65 | +Print the byte number (decimal) and the differing | |
66 | +byte values (octal) for each difference. | |
67 | +.It Fl s | |
68 | +Print nothing for differing files; return exit | |
69 | +status only. | |
70 | +.El | |
71 | +.Pp | |
72 | +The optional arguments | |
73 | +.Ar skip1 | |
74 | +and | |
75 | +.Ar skip2 | |
76 | +are the byte offsets from the beginning of | |
77 | +.Ar file1 | |
78 | +and | |
79 | +.Ar file2 , | |
80 | +respectively, where the comparison will begin. | |
81 | +The offset is decimal by default, but may be expressed as an hexadecimal | |
82 | +or octal value by preceding it with a leading ``0x'' or ``0''. | |
83 | +.Pp | |
84 | +The | |
85 | +.Nm cmp | |
86 | +utility exits with one of the following values: | |
87 | +.Bl -tag -width 4n | |
88 | +.It 0 | |
89 | +The files are identical. | |
90 | +.It 1 | |
91 | +The files are different; this includes the case | |
92 | +where one file is identical to the first part of | |
93 | +the other. | |
94 | +In the latter case, if the | |
95 | +.Fl s | |
96 | +option has not been specified, | |
97 | +.Nm cmp | |
98 | +writes to standard output that EOF was reached in the shorter | |
99 | +file (before any differences were found). | |
100 | +.It >1 | |
101 | +An error occurred. | |
102 | +.El | |
103 | +.Sh SEE ALSO | |
104 | +.Xr diff 1 , | |
105 | +.Xr diff3 1 | |
106 | +.Sh STANDARDS | |
107 | +The | |
108 | +.Nm cmp | |
109 | +utility is expected to be | |
110 | +.St -p1003.2 | |
111 | +compatible. | |
112 | diff -Nru diffutils-2.7/man/diff.1 diffutils-2.7.new/man/diff.1 | |
113 | --- diffutils-2.7/man/diff.1 Thu Jan 1 01:00:00 1970 | |
114 | +++ diffutils-2.7.new/man/diff.1 Sun Mar 21 14:45:00 1999 | |
115 | @@ -0,0 +1,473 @@ | |
116 | +.TH DIFF 1 "22sep1993" "GNU Tools" "GNU Tools" | |
117 | +.SH NAME | |
118 | +diff \- find differences between two files | |
119 | +.SH SYNOPSIS | |
120 | +.B diff | |
121 | +[options] from-file to-file | |
122 | +.SH DESCRIPTION | |
123 | +In the simplest case, | |
124 | +.I diff | |
125 | +compares the contents of the two files | |
126 | +.I from-file | |
127 | +and | |
128 | +.IR to-file . | |
129 | +A file name of | |
130 | +.B \- | |
131 | +stands for | |
132 | +text read from the standard input. As a special case, | |
133 | +.B "diff \- \-" | |
134 | +compares a copy of standard input to itself. | |
135 | + | |
136 | +If | |
137 | +.I from-file | |
138 | +is a directory and | |
139 | +.I to-file | |
140 | +is not, | |
141 | +.I diff | |
142 | +compares the file in | |
143 | +.I from-file | |
144 | +whose file name is that of | |
145 | +.IR to-file , | |
146 | +and vice versa. The non-directory file must not be | |
147 | +.BR \- . | |
148 | + | |
149 | +If both | |
150 | +.I from-file | |
151 | +and | |
152 | +.I to-file | |
153 | +are directories, | |
154 | +.I diff | |
155 | +compares corresponding files in both directories, in | |
156 | +alphabetical order; this comparison is not recursive unless the | |
157 | +.B \-r | |
158 | +or | |
159 | +.B \-\-recursive | |
160 | +option is given. | |
161 | +.I diff | |
162 | +never | |
163 | +compares the actual contents of a directory as if it were a file. The | |
164 | +file that is fully specified may not be standard input, because standard | |
165 | +input is nameless and the notion of ``file with the same name'' does not | |
166 | +apply. | |
167 | + | |
168 | +.B diff | |
169 | +options begin with | |
170 | +.BR \- , | |
171 | +so normally | |
172 | +.I from-file | |
173 | +and | |
174 | +.I to-file | |
175 | +may not begin with | |
176 | +.BR \- . | |
177 | +However, | |
178 | +.B \-\- | |
179 | +as an | |
180 | +argument by itself treats the remaining arguments as file names even if | |
181 | +they begin with | |
182 | +.BR \- . | |
183 | +.SS Options | |
184 | +Below is a summary of all of the options that GNU | |
185 | +.I diff | |
186 | +accepts. | |
187 | +Most options have two equivalent names, one of which is a single letter | |
188 | +preceded by | |
189 | +.BR \- , | |
190 | +and the other of which is a long name preceded by | |
191 | +.BR \-\- . | |
192 | +Multiple single letter options (unless they take an | |
193 | +argument) can be combined into a single command line word: | |
194 | +.B \-ac | |
195 | +is | |
196 | +equivalent to | |
197 | +.BR "\-a \-c" . | |
198 | +Long named options can be abbreviated to | |
199 | +any unique prefix of their name. Brackets | |
200 | +.RB ( [ | |
201 | +and | |
202 | +.BR ] ) | |
203 | +indicate that an | |
204 | +option takes an optional argument. | |
205 | +.TP | |
206 | +.BI \- lines | |
207 | +Show | |
208 | +.I lines | |
209 | +(an integer) lines of context. This option does not | |
210 | +specify an output format by itself; it has no effect unless it is | |
211 | +combined with | |
212 | +.B \-c | |
213 | +or | |
214 | +.BR \-u . | |
215 | +This option is obsolete. For proper | |
216 | +operation, | |
217 | +.I patch | |
218 | +typically needs at least two lines of context. | |
219 | +.TP | |
220 | +.B \-a | |
221 | +Treat all files as text and compare them line-by-line, even if they | |
222 | +do not seem to be text. | |
223 | +.TP | |
224 | +.B \-b | |
225 | +Ignore changes in amount of white space. | |
226 | +.TP | |
227 | +.B \-B | |
228 | +Ignore changes that just insert or delete blank lines. | |
229 | +.TP | |
230 | +.B \-\-brief | |
231 | +Report only whether the files differ, not the details of the | |
232 | +differences. | |
233 | +.TP | |
234 | +.B \-c | |
235 | +Use the context output format. | |
236 | +.TP | |
237 | +.BI "\-C " lines | |
238 | +.br | |
239 | +.ns | |
240 | +.TP | |
241 | +.BI \-\-context[= lines ] | |
242 | +Use the context output format, showing | |
243 | +.I lines | |
244 | +(an integer) lines of | |
245 | +context, or three if | |
246 | +.I lines | |
247 | +is not given. | |
248 | +For proper operation, | |
249 | +.I patch | |
250 | +typically needs at least two lines of | |
251 | +context. | |
252 | +.TP | |
253 | +.BI \-\-changed\-group\-format= format | |
254 | +Use | |
255 | +.I format | |
256 | +to output a line group containing differing lines from | |
257 | +both files in if-then-else format. | |
258 | +.TP | |
259 | +.B \-d | |
260 | +Change the algorithm to perhaps find a smaller set of changes. This makes | |
261 | +.I diff | |
262 | +slower (sometimes much slower). | |
263 | +.TP | |
264 | +.BI "\-D " name | |
265 | +Make merged if-then-else format output, conditional on the preprocessor | |
266 | +macro | |
267 | +.IR name . | |
268 | +.TP | |
269 | +.B \-e | |
270 | +.br | |
271 | +.ns | |
272 | +.TP | |
273 | +.B \-\-ed | |
274 | +Make output that is a valid | |
275 | +.I ed | |
276 | +script. | |
277 | +.TP | |
278 | +.BI \-\-exclude= pattern | |
279 | +When comparing directories, ignore files and subdirectories whose basenames | |
280 | +match | |
281 | +.IR pattern . | |
282 | +.TP | |
283 | +.BI \-\-exclude\-from= file | |
284 | +When comparing directories, ignore files and subdirectories whose basenames | |
285 | +match any pattern contained in | |
286 | +.IR file . | |
287 | +.TP | |
288 | +.B \-\-expand\-tabs | |
289 | +Expand tabs to spaces in the output, to preserve the alignment of tabs | |
290 | +in the input files. | |
291 | +.TP | |
292 | +.B \-f | |
293 | +Make output that looks vaguely like an | |
294 | +.I ed | |
295 | +script but has changes | |
296 | +in the order they appear in the file. | |
297 | +.TP | |
298 | +.BI "\-F " regexp | |
299 | +In context and unified format, for each hunk of differences, show some | |
300 | +of the last preceding line that matches | |
301 | +.IR regexp . | |
302 | +.TP | |
303 | +.B \-\-forward\-ed | |
304 | +Make output that looks vaguely like an | |
305 | +.B ed | |
306 | +script but has changes | |
307 | +in the order they appear in the file. | |
308 | +.TP | |
309 | +.B \-h | |
310 | +This option currently has no effect; it is present for Unix | |
311 | +compatibility. | |
312 | +.TP | |
313 | +.B \-H | |
314 | +Use heuristics to speed handling of large files that have numerous | |
315 | +scattered small changes. | |
316 | +.TP | |
317 | +.BI \-\-horizon\-lines= lines | |
318 | +Do not discard the last | |
319 | +.I lines | |
320 | +lines of the common prefix | |
321 | +and the first | |
322 | +.I lines | |
323 | +lines of the common suffix. | |
324 | +.TP | |
325 | +.B \-i | |
326 | +Ignore changes in case; consider upper- and lower-case letters | |
327 | +equivalent. | |
328 | +.TP | |
329 | +.BI "\-I " regexp | |
330 | +Ignore changes that just insert or delete lines that match | |
331 | +.IR regexp . | |
332 | +.TP | |
333 | +.BI \-\-ifdef= name | |
334 | +Make merged if-then-else format output, conditional on the preprocessor | |
335 | +macro | |
336 | +.IR name . | |
337 | +.TP | |
338 | +.B \-\-ignore\-all\-space | |
339 | +Ignore white space when comparing lines. | |
340 | +.TP | |
341 | +.B \-\-ignore\-blank\-lines | |
342 | +Ignore changes that just insert or delete blank lines. | |
343 | +.TP | |
344 | +.B \-\-ignore\-case | |
345 | +Ignore changes in case; consider upper- and lower-case to be the same. | |
346 | +.TP | |
347 | +.BI \-\-ignore\-matching\-lines= regexp | |
348 | +Ignore changes that just insert or delete lines that match | |
349 | +.IR regexp . | |
350 | +.TP | |
351 | +.B \-\-ignore\-space\-change | |
352 | +Ignore changes in amount of white space. | |
353 | +.TP | |
354 | +.B \-\-initial\-tab | |
355 | +Output a tab rather than a space before the text of a line in normal or | |
356 | +context format. This causes the alignment of tabs in the line to look | |
357 | +normal. | |
358 | +.TP | |
359 | +.B \-l | |
360 | +Pass the output through | |
361 | +.I pr | |
362 | +to paginate it. | |
363 | +.TP | |
364 | +.BI "\-L " label | |
365 | +.br | |
366 | +.ns | |
367 | +.TP | |
368 | +.BI \-\-label= label | |
369 | +Use | |
370 | +.I label | |
371 | +instead of the file name in the context format | |
372 | +and unified format | |
373 | +headers. | |
374 | +.TP | |
375 | +.B \-\-left\-column | |
376 | +Print only the left column of two common lines in side by side format. | |
377 | +.TP | |
378 | +.BI \-\-line\-format= format | |
379 | +Use | |
380 | +.I format | |
381 | +to output all input lines in in-then-else format. | |
382 | +.TP | |
383 | +.B \-\-minimal | |
384 | +Change the algorithm to perhaps find a smaller set of changes. This | |
385 | +makes | |
386 | +.I diff | |
387 | +slower (sometimes much slower). | |
388 | +.TP | |
389 | +.B \-n | |
390 | +Output RCS-format diffs; like | |
391 | +.B \-f | |
392 | +except that each command | |
393 | +specifies the number of lines affected. | |
394 | +.TP | |
395 | +.B \-N | |
396 | +.br | |
397 | +.ns | |
398 | +.TP | |
399 | +.B \-\-new\-file | |
400 | +In directory comparison, if a file is found in only one directory, | |
401 | +treat it as present but empty in the other directory. | |
402 | +.TP | |
403 | +.BI \-\-new\-group\-format= format | |
404 | +Use | |
405 | +.I format | |
406 | +to output a group of lines taken from just the second | |
407 | +file in if-then-else format. | |
408 | +.TP | |
409 | +.BI \-\-new\-line\-format= format | |
410 | +Use | |
411 | +.I format | |
412 | +to output a line taken from just the second file in | |
413 | +if-then-else format. | |
414 | +.TP | |
415 | +.BI \-\-old\-group\-format= format | |
416 | +Use | |
417 | +.I format | |
418 | +to output a group of lines taken from just the first | |
419 | +file in if-then-else format. | |
420 | +.TP | |
421 | +.BI \-\-old\-line\-format= format | |
422 | +Use | |
423 | +.I format | |
424 | +to output a line taken from just the first file in | |
425 | +if-then-else format. | |
426 | +.TP | |
427 | +.B \-p | |
428 | +Show which C function each change is in. | |
429 | +.TP | |
430 | +.B \-P | |
431 | +When comparing directories, if a file appears only in the second | |
432 | +directory of the two, treat it as present but empty in the other. | |
433 | +.TP | |
434 | +.B \-\-paginate | |
435 | +Pass the output through | |
436 | +.I pr | |
437 | +to paginate it. | |
438 | +.TP | |
439 | +.B \-q | |
440 | +Report only whether the files differ, not the details of the | |
441 | +differences. | |
442 | +.TP | |
443 | +.B \-r | |
444 | +When comparing directories, recursively compare any subdirectories | |
445 | +found. | |
446 | +.TP | |
447 | +.B \-\-rcs | |
448 | +Output RCS-format diffs; like | |
449 | +.B \-f | |
450 | +except that each command | |
451 | +specifies the number of lines affected. | |
452 | +.TP | |
453 | +.B \-\-recursive | |
454 | +When comparing directories, recursively compare any subdirectories | |
455 | +found. | |
456 | +.TP | |
457 | +.B \-\-report\-identical\-files | |
458 | +.br | |
459 | +.ns | |
460 | +.TP | |
461 | +.B \-s | |
462 | +Report when two files are the same. | |
463 | +.TP | |
464 | +.BI "\-S " file | |
465 | +When comparing directories, start with the file | |
466 | +.IR file . | |
467 | +This is | |
468 | +used for resuming an aborted comparison. | |
469 | +.TP | |
470 | +.B \-\-sdiff\-merge\-assist | |
471 | +Print extra information to help | |
472 | +.IR sdiff . | |
473 | +.I sdiff | |
474 | +uses this | |
475 | +option when it runs | |
476 | +.IR diff . | |
477 | +This option is not intended for users | |
478 | +to use directly. | |
479 | +.TP | |
480 | +.B \-\-show\-c\-function | |
481 | +Show which C function each change is in. | |
482 | +.TP | |
483 | +.BI \-\-show\-function\-line= regexp | |
484 | +In context and unified format, for each hunk of differences, show some | |
485 | +of the last preceding line that matches | |
486 | +.IR regexp . | |
487 | +.TP | |
488 | +.B \-\-side\-by\-side | |
489 | +Use the side by side output format. | |
490 | +.TP | |
491 | +.B \-\-speed\-large\-files | |
492 | +Use heuristics to speed handling of large files that have numerous | |
493 | +scattered small changes. | |
494 | +.TP | |
495 | +.BI \-\-starting\-file= file | |
496 | +When comparing directories, start with the file | |
497 | +.IR file . | |
498 | +This is | |
499 | +used for resuming an aborted comparison. | |
500 | +.TP | |
501 | +.B \-\-suppress\-common\-lines | |
502 | +Do not print common lines in side by side format. | |
503 | +.TP | |
504 | +.B \-t | |
505 | +Expand tabs to spaces in the output, to preserve the alignment of tabs | |
506 | +in the input files. | |
507 | +.TP | |
508 | +.B \-T | |
509 | +Output a tab rather than a space before the text of a line in normal or | |
510 | +context format. This causes the alignment of tabs in the line to look | |
511 | +normal. | |
512 | +.TP | |
513 | +.B \-\-text | |
514 | +Treat all files as text and compare them line-by-line, even if they | |
515 | +do not appear to be text. | |
516 | +.TP | |
517 | +.B \-u | |
518 | +Use the unified output format. | |
519 | +.TP | |
520 | +.BI \-\-unchanged\-group\-format= format | |
521 | +Use | |
522 | +.I format | |
523 | +to output a group of common lines taken from both files | |
524 | +in if-then-else format. | |
525 | +.TP | |
526 | +.BI \-\-unchanged\-line\-format= format | |
527 | +Use | |
528 | +.I format | |
529 | +to output a line common to both files in if-then-else | |
530 | +format. | |
531 | +.TP | |
532 | +.B \-\-unidirectional\-new\-file | |
533 | +When comparing directories, if a file appears only in the second | |
534 | +directory of the two, treat it as present but empty in the other. | |
535 | +.TP | |
536 | +.BI "\-U " lines | |
537 | +.br | |
538 | +.ns | |
539 | +.TP | |
540 | +.BI \-\-unified[= lines ] | |
541 | +Use the unified output format, showing | |
542 | +.I lines | |
543 | +(an integer) lines of | |
544 | +context, or three if | |
545 | +.I lines | |
546 | +is not given. | |
547 | +For proper operation, | |
548 | +.I patch | |
549 | +typically needs at least two lines of | |
550 | +context. | |
551 | +.TP | |
552 | +.B \-v | |
553 | +.br | |
554 | +.ns | |
555 | +.TP | |
556 | +.B \-\-version | |
557 | +Output the version number of | |
558 | +.IR diff . | |
559 | +.TP | |
560 | +.B \-w | |
561 | +Ignore white space when comparing lines. | |
562 | +.TP | |
563 | +.BI "\-W " columns | |
564 | +.br | |
565 | +.ns | |
566 | +.TP | |
567 | +.BI \-\-width= columns | |
568 | +Use an output width of | |
569 | +.I columns | |
570 | +in side by side format. | |
571 | +.TP | |
572 | +.BI "\-x " pattern | |
573 | +When comparing directories, ignore files and subdirectories whose basenames | |
574 | +match | |
575 | +.IR pattern . | |
576 | +.TP | |
577 | +.BI "\-X " file | |
578 | +When comparing directories, ignore files and subdirectories whose basenames | |
579 | +match any pattern contained in | |
580 | +.IR file . | |
581 | +.TP | |
582 | +.B \-y | |
583 | +Use the side by side output format. | |
584 | +.SH SEE ALSO | |
585 | +cmp(1), comm(1), diff3(1), ed(1), patch(1), pr(1), sdiff(1). | |
586 | +.SH DIAGNOSTICS | |
587 | +An exit status of 0 means no differences were found, 1 means some | |
588 | +differences were found, and 2 means trouble. | |
589 | diff -Nru diffutils-2.7/man/diff3.1 diffutils-2.7.new/man/diff3.1 | |
590 | --- diffutils-2.7/man/diff3.1 Thu Jan 1 01:00:00 1970 | |
591 | +++ diffutils-2.7.new/man/diff3.1 Sun Mar 21 14:45:00 1999 | |
592 | @@ -0,0 +1,210 @@ | |
593 | +.TH DIFF3 1 "22sep1993" "GNU Tools" "GNU Tools" | |
594 | +.SH NAME | |
595 | +diff3 \- find differences between three files | |
596 | +.SH SYNOPSIS | |
597 | +.B diff3 | |
598 | +[options] mine older yours | |
599 | +.SH DESCRIPTION | |
600 | +The | |
601 | +.I diff3 | |
602 | +command compares three files and outputs descriptions | |
603 | +of their differences. | |
604 | + | |
605 | +The files to compare are | |
606 | +.IR mine , | |
607 | +.IR older , | |
608 | +and | |
609 | +.IR yours . | |
610 | +At most one of these three file names may be | |
611 | +.BR \- , | |
612 | +which tells | |
613 | +.I diff3 | |
614 | +to read the standard input for that file. | |
615 | +.SS Options | |
616 | +Below is a summary of all of the options that GNU | |
617 | +.I diff3 | |
618 | +accepts. Multiple single letter options (unless they take an argument) | |
619 | +can be combined into a single command line argument. | |
620 | +.TP | |
621 | +.B \-a | |
622 | +Treat all files as text and compare them line-by-line, even if they | |
623 | +do not appear to be text. | |
624 | +.TP | |
625 | +.B \-A | |
626 | +Incorporate all changes from | |
627 | +.I older | |
628 | +to | |
629 | +.I yours | |
630 | +into | |
631 | +.IR mine , | |
632 | +surrounding all conflicts with bracket lines. | |
633 | +.TP | |
634 | +.B \-B | |
635 | +Old behavior of -A. Shows non-conflicts. | |
636 | +.TP | |
637 | +.B \-e | |
638 | +Generate an | |
639 | +.I ed | |
640 | +script that incorporates all the changes from | |
641 | +.I older | |
642 | +to | |
643 | +.I yours | |
644 | +into | |
645 | +.IR mine . | |
646 | +.TP | |
647 | +.B \-E | |
648 | +Like | |
649 | +.BR \-e , | |
650 | +except bracket lines from overlapping changes' first | |
651 | +and third files. | |
652 | +With | |
653 | +.BR \-e , | |
654 | +an overlapping change looks like this: | |
655 | +.sp | |
656 | +.nf | |
657 | +<<<<<<< \fImine\fP | |
658 | +lines from \fImine\fP | |
659 | +======= | |
660 | +lines from \fIyours\fP | |
661 | +>>>>>>> \fIyours\fP | |
662 | +.fi | |
663 | +.TP | |
664 | +.B \-\-ed | |
665 | +Generate an | |
666 | +.I ed | |
667 | +script that incorporates all the changes from | |
668 | +.I older | |
669 | +to | |
670 | +.I yours | |
671 | +into | |
672 | +.IR mine . | |
673 | +.TP | |
674 | +.B \-\-easy\-only | |
675 | +Like | |
676 | +.BR \-e , | |
677 | +except output only the nonoverlapping changes. | |
678 | +.TP | |
679 | +.B \-i | |
680 | +Generate | |
681 | +.B w | |
682 | +and | |
683 | +.B q | |
684 | +commands at the end of the | |
685 | +.I ed | |
686 | +script for System V compatibility. This option must be combined with | |
687 | +one of the | |
688 | +.B \-AeExX3 | |
689 | +options, and may not be combined with | |
690 | +.BR \-m . | |
691 | +.TP | |
692 | +.B \-\-initial\-tab | |
693 | +Output a tab rather than two spaces before the text of a line in normal format. | |
694 | +This causes the alignment of tabs in the line to look normal. | |
695 | +.TP | |
696 | +.BI "\-L " label | |
697 | +.ns | |
698 | +.TP | |
699 | +.BI \-\-label= label | |
700 | +Use the label | |
701 | +.I label | |
702 | +for the brackets output by the | |
703 | +.BR \-A , | |
704 | +.B \-E | |
705 | +and | |
706 | +.B \-X | |
707 | +options. This option may be given up to three | |
708 | +times, one for each input file. The default labels are the names of | |
709 | +the input files. Thus | |
710 | +.B "diff3 \-L X \-L Y \-L Z \-m A B C" | |
711 | +acts like | |
712 | +.BR "diff3 \-m A B C , | |
713 | +except that the output looks like it came from | |
714 | +files named | |
715 | +.BR X , | |
716 | +.B Y | |
717 | +and | |
718 | +.B Z | |
719 | +rather than from files | |
720 | +named | |
721 | +.BR A , | |
722 | +.B B | |
723 | +and | |
724 | +.BR C . | |
725 | +.TP | |
726 | +.B \-m | |
727 | +.br | |
728 | +.ns | |
729 | +.TP | |
730 | +.B \-\-merge | |
731 | +Apply the edit script to the first file and send the result to standard | |
732 | +output. Unlike piping the output from | |
733 | +.I diff3 | |
734 | +to | |
735 | +.IR ed , | |
736 | +this | |
737 | +works even for binary files and incomplete lines. | |
738 | +.B \-A | |
739 | +is assumed | |
740 | +if no edit script option is specified. | |
741 | +.TP | |
742 | +.B \-\-overlap\-only | |
743 | +Like | |
744 | +.BR \-e , | |
745 | +except output only the overlapping changes. | |
746 | +.TP | |
747 | +.B \-\-show\-all | |
748 | +Incorporate all unmerged changes from | |
749 | +.I older | |
750 | +to | |
751 | +.I yours | |
752 | +into | |
753 | +.IR mine , | |
754 | +surrounding all overlapping changes with bracket lines. | |
755 | +.TP | |
756 | +.B \-\-show\-overlap | |
757 | +Like | |
758 | +.BR \-e , | |
759 | +except bracket lines from overlapping changes' first | |
760 | +and third files. | |
761 | +.TP | |
762 | +.B \-T | |
763 | +Output a tab rather than two spaces before the text of a line in normal format. | |
764 | +This causes the alignment of tabs in the line to look normal. | |
765 | +.TP | |
766 | +.B \-\-text | |
767 | +Treat all files as text and compare them line-by-line, even if they | |
768 | +do not appear to be text. | |
769 | +.TP | |
770 | +.B \-v | |
771 | +.br | |
772 | +.ns | |
773 | +.TP | |
774 | +.B \-\-version | |
775 | +Output the version number of | |
776 | +.IR diff3 . | |
777 | +.TP | |
778 | +.B \-x | |
779 | +Like | |
780 | +.BR \-e , | |
781 | +except output only the overlapping changes. | |
782 | +.TP | |
783 | +.B \-X | |
784 | +Like | |
785 | +.BR \-E , | |
786 | +except output only the overlapping changes. | |
787 | +In other words, like | |
788 | +.BR \-x , | |
789 | +except bracket changes as in | |
790 | +.BR \-E . | |
791 | +.TP | |
792 | +.B \-3 | |
793 | +Like | |
794 | +.BR \-e , | |
795 | +except output only the nonoverlapping changes. | |
796 | +.SH SEE ALSO | |
797 | +cmp(1), comm(1), diff(1), ed(1), patch(1), sdiff(1). | |
798 | +.SH DIAGNOSTICS | |
799 | +An exit status of 0 means | |
800 | +.I diff3 | |
801 | +was successful, 1 means some | |
802 | +conflicts were found, and 2 means trouble. | |
803 | diff -Nru diffutils-2.7/man/pl/diff.1 diffutils-2.7.new/man/pl/diff.1 | |
804 | --- diffutils-2.7/man/pl/diff.1 Thu Jan 1 01:00:00 1970 | |
805 | +++ diffutils-2.7.new/man/pl/diff.1 Thu Feb 4 13:44:25 1999 | |
806 | @@ -0,0 +1,348 @@ | |
807 | +.\" {PTM/AB/0.1/21-12-1998/""} | |
808 | +.\" translated by Adam Byrtek <alpha@irc.pl> | |
809 | +.\" ------------ | |
810 | +.\" Date: Fri, 11 Sep 1998 19:13:45 +0100 | |
811 | +.\" From: Edward Betts <edward@hairnet.demon.co.uk> | |
812 | +.\" | |
813 | +.\" Derived from the GNU diff info page. | |
814 | +.\" May be distributed under the GPL. | |
815 | +.\" ------------ | |
816 |