.\" @(#)diff3.1 6.2 (Berkeley) %G%
diff3 \- 3-way differential file comparison
compares three versions of a file,
and publishes disagreeing ranges of text
flagged with these codes:
.IR file1 " is different"
.IR file2 " is different"
.IR file3 " is different"
The type of change suffered in converting a given range
of a given file to some other is
indicated in one of these ways:
Text is to be appended after line number
.IB f " : " n1 " , " n2 " c"
changed in the range line
the range may be abbreviated to
The original contents of the range follows immediately
files are identical, the contents of the lower-numbered
publishes a script for the editor
that will incorporate into
the changes that normally would be flagged ==== and ====3.
produces a script to incorporate
only changes flagged ==== (====3).
The following command will apply the resulting script to
(cat script; echo \'1,$p\') \(bv ed \- file1
respectively, but treat overlapping changes (i.e., changes that would
be flagged with ==== in the normal listing) differently. The overlapping
lines from both files will be inserted by the edit script, bracketed
by "<<<<<<" and ">>>>>>" lines.
For example, suppose lines 7-8 are changed in both file1 and file2.
Applying the edit script generated by the command
"diff3 -E file1 file2 file3"
to file1 results in the file:
to insure that overlapping changes in the merged files are preserved
and brought to someone's attention.
Text lines that consist of a single `.' will