DIFF3(1)
NAME
diff3 − three-way differential file comparison
USAGE
diff3 [ −ex3 ] file1 file2 file3
DESCRIPTION
Diff3 compares three versions of a file, and publishes disagreeing ranges of text flagged with these codes:
==== all three files are different
====1 file1 is different
====2 file2 is different
====3 file3 is different
To indicate what type of change was made to convert a given range of a given file to some other, diff3 uses the following:
f : n1 a Text is to be appended after line number n1 in file f, where f = 1, 2, or 3.
f : n1 , n2 c Text is to be changed in the range line n1 to line n2. If n1 = n2, the range may be abbreviated to n1.
The original contents of the range follows immediately after a c indication. When the contents of two files are identical, the contents of the lower-numbered file is suppressed.
OPTIONS
−e Publish a script for the text editor ed (1) that will incorporate into file1 all changes between file2 and file3. These changes are ones normally flagged with ==== and ====3.
−x (−3) Produce a script to incorporate only those changes flagged ==== (====3). The following applies the resulting script to file1:
(cat script; echo ’1,$p’) │ ed − file1
CAUTIONS
Text lines consisting of a single period defeat the −e option.
FILES
/tmp/d3?????
/usr/lib/diff3