diff options
Diffstat (limited to 'usr/src/man/man1/diff3.1')
| -rw-r--r-- | usr/src/man/man1/diff3.1 | 45 |
1 files changed, 6 insertions, 39 deletions
diff --git a/usr/src/man/man1/diff3.1 b/usr/src/man/man1/diff3.1 index 27988ae4bb..001761ac6b 100644 --- a/usr/src/man/man1/diff3.1 +++ b/usr/src/man/man1/diff3.1 @@ -3,7 +3,7 @@ .\" 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. .\" 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. .\" 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] -.TH diff3 1 "7 Nov 2005" "SunOS 5.11" "User Commands" +.TH DIFF3 1 "Nov 7, 2005" .SH NAME diff3 \- 3-way differential file comparison .SH SYNOPSIS @@ -19,45 +19,37 @@ diff3 \- 3-way differential file comparison of text flagged with the following codes: .sp .ne 2 -.mk .na \fB\fB====\fR\fR .ad .RS 9n -.rt all three files differ .RE .sp .ne 2 -.mk .na \fB\fB====1\fR\fR .ad .RS 9n -.rt \fIfilename1\fRis different .RE .sp .ne 2 -.mk .na \fB\fB====2\fR\fR .ad .RS 9n -.rt \fIfilename2\fRis different .RE .sp .ne 2 -.mk .na \fB\fB====3\fR\fR .ad .RS 9n -.rt \fIfilename3\fRis different .RE @@ -67,24 +59,20 @@ The type of change suffered in converting a given range of a given file to some other is indicated in one of the following ways: .sp .ne 2 -.mk .na \fB\fIf\fR\fB : \fR\fIn1\fR\fB a\fR\fR .ad .RS 17n -.rt Text is to be appended after line number \fIn1\fR in file \fIf\fR, where \fIf\fR = 1, 2, or 3. .RE .sp .ne 2 -.mk .na \fB\fIf\fR\fB : \fR\fIn1\fR\fB , \fR\fIn2\fR\fB c\fR\fR .ad .RS 17n -.rt Text is to be changed in the range line \fIn1\fR to line \fIn2\fR. If \fIn1\fR = \fIn\fR2, the range can be abbreviated to \fIn1\fR. .RE @@ -111,12 +99,10 @@ The following command applies the resulting script to \fIfilename1\fR. The following options are supported: .sp .ne 2 -.mk .na \fB\fB-e\fR \fR .ad .RS 7n -.rt Produce a script for the \fBed\fR(1) editor that incorporates into \fIfilename1\fR all changes between \fIfilename2\fR and \fIfilename3\fR (that is, the changes that normally would be flagged \fB====\fR and \fB====3\fR). @@ -126,12 +112,10 @@ Text lines that consist of a single dot (\fB\&.\fR defeat the \fB-e\fR option. .sp .ne 2 -.mk .na \fB\fB-E\fR \fR .ad .RS 7n -.rt Produce a script that incorporates all changes between \fIfilename2\fR and \fIfilename3\fR, but treat overlapping changes (that is, changes that would be flagged with \fB====\fR in the normal listing) differently. The overlapping @@ -141,35 +125,29 @@ lines from both files are inserted by the edit script, bracketed by .sp .ne 2 -.mk .na \fB\fB-x\fR \fR .ad .RS 7n -.rt Produce a script to incorporate only changes flagged \fB====\fR. .RE .sp .ne 2 -.mk .na \fB\fB-X\fR \fR .ad .RS 7n -.rt Produce a script that incorporates only changes flagged \fB====\fR, but treat these changes in the manner of the \fB-E\fR option. .RE .sp .ne 2 -.mk .na \fB\fB-3\fR \fR .ad .RS 7n -.rt Produce a script to incorporate only changes flagged \fB====3\fR. .RE @@ -181,23 +159,19 @@ encountering files greater than or equal to 2 Gbyte ( 2^31 bytes). .SH FILES .sp .ne 2 -.mk .na \fB\fB/tmp/d3*\fR \fR .ad .RS 23n -.rt .RE .sp .ne 2 -.mk .na \fB\fB/usr/lib/diff3prog\fR \fR .ad .RS 23n -.rt .RE @@ -207,34 +181,28 @@ encountering files greater than or equal to 2 Gbyte ( 2^31 bytes). The following exit values are returned: .sp .ne 2 -.mk .na \fB\fB0\fR \fR .ad .RS 6n -.rt Successful completion. .RE .sp .ne 2 -.mk .na \fB\fB1\fR\fR .ad .RS 6n -.rt An error occurred. A difference was found or there was a fatal error. .RE .sp .ne 2 -.mk .na \fB\fB>1\fR\fR .ad .RS 6n -.rt A fatal error occurred. .RE @@ -250,13 +218,12 @@ See \fBattributes\fR(5) for descriptions of the following attributes: .sp .TS -tab() box; -cw(2.75i) |cw(2.75i) -lw(2.75i) |lw(2.75i) -. -ATTRIBUTE TYPEATTRIBUTE VALUE +box; +c | c +l | l . +ATTRIBUTE TYPE ATTRIBUTE VALUE _ -CSIEnabled +CSI Enabled .TE .SH SEE ALSO |