DIFF3(1) DOMAIN/IX Reference Manual (SYS5) DIFF3(1)
NAME
diff3 - 3-way differential file comparison
USAGE
diff3 [ -ex3 ] file1 file2 file3
DESCRIPTION
Diff3 compares three versions of a file, and flags disagree-
ing text ranges with these codes:
==== all three files are different
====1 file1 is different
====2 file2 is different
====3 file3 is different
Diff3 indicates the type of change made in converting a
given range of a given file to some other in one of these
ways:
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 immediately follow a c
indication. When the contents of two files are identical,
the contents of the lower-numbered file are suppressed.
OPTIONS
-e Publish a script for the text editor ed (1) that
incorporates into file1 all changes between file2
and file3. These changes are normally flagged by
==== and ====3.
-x (-3) Produce a script to incorporate only changes
flagged ==== (====3). The following command
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 longer than 64K bytes do not work.
Printed 6/10/85 DIFF3-1
DIFF3(1) DOMAIN/IX Reference Manual (SYS5) DIFF3(1)
FILES
/tmp/d3*
/usr/lib/diff3prog
RELATED INFORMATION
diff (1).
DIFF3-2 Printed 6/10/85