PWB1/usr/man/man1/diff3.1

.th DIFF3 I 5/31/77
.sh NAME
diff3 \*- 3-way differential file comparison
.sh SYNOPSIS
.bd diff3
[
.bd \*-ex3
]
file1 file2 file3
.sh DESCRIPTION
.it Diff3
compares three versions of a file,
and publishes disagreeing ranges of text
flagged with these codes:
.s3
.lp +16 12
====	all three files differ
.s3
.lp +16 12
====1	\fIfile1\fR is different
.s3
.lp +16 12
====2	\fIfile2\fR is different
.s3
.lp +16 12
====3	\fIfile3\fR is different
.i0
.s3
The type of change suffered in converting a given range
of a given file to some other is
indicated in one of these ways:
.s3
.lp +16 12
\fIf\fB\ :\ \fIn1\ \fBa\fR	Text is to be appended after line number
.it n1
in file
.it f,
where
.it f
= 1, 2, or 3.
.s3
.lp +16 12
\fIf\fB\ :\ \fIn1,n2\fB\ c\fR	Text is to be
changed in the range line
.it n1
to line
.it n2.
If
.it n1
=
.it n2,
the range may be abbreviated to
.it n1.
.i0
.s3
The original contents of the range follows immediately
after a
.bd c
indication.
When the contents of two
files are identical, the contents of the lower-numbered
file is suppressed.
.s3
Under the
.bd \*-e
option,
.it diff3
publishes a script for the editor
.it ed
that will incorporate into
.it file1
all changes between
.it file2
and
.it file3,
.it i.e.
the changes that normally would be flagged ==== and ====3.
Option
.bd \*-x
(\fB\*-3\fR)
produces a script to incorporate
only changes flagged ==== (====3).
The following command will apply the resulting script to
`file1'.
.s3
.if t .ds v \(bv
.if n .ds v |
.tr ||
.ti 16n
(cat script; echo \*'1,$p\*') \*v ed \*- file1
.sh "SEE ALSO"
diff(I)
.sh BUGS
Text lines that consist of a single `.' will
defeat
.bd \*-e.
.sh "FILES"
/tmp/d3a?????
.br
/tmp/d3b?????