HP UX Operating Systems 209

diff3(1)

NAME

diff3 - 3-way differential ®le comparison

SYNOPSIS

diff3 [-exEX3]®le1 ®le2 ®le3

DESCRIPTION

diff3 compares three versions of a ®le, and prints disagreeing ranges of text ¯agged with these codes:

====all three ®les differ

====1 ®le1 is different

====2 ®le2 is different

====3 ®le3 is different

The type of change required to convert a given range of a given ®le to some other is indicated in one of these ways:

f:n1a

Text is to be appended after line number n1 in ®le f, where f = 1, 2, or 3.

f:n1,n2c Text is to be changed in the range line n1 through line n2. If n1 = n2, the range can be abbreviated to n1.

The original contents of the range follows immediately after a c indication. When the contents of two ®les are identical, the contents of the lower-numbered ®le is suppressed.

-e diff3 Produces a script for the ed editor that can be used to incorporate into ®le1 all changes between ®le2 and ®le3 (see ed(1)); i.e., the changes that normally would be ¯agged

==== and ====3.

-x	Produces a script to incorporate only changes ¯agged	====
-3	Produces a script to incorporate only changes ¯agged	====3
-E	Produces a script that will incorporate all changes between ®le2 and ®le3, but treat overlap-
	ping changes (that is, changes that would be ¯agged with		==== in normal listing)
	differently. The overlapping lines in both ®les will be inserted by the edit script bracketed
	by <<<<<< and >>>>>> lines.
-X	Produces a script that will incorporate only changes ¯agged		==== , but treat these
	changes in the manner of -Eoption.

The following command applies the resulting script to ®le1.

(cat script; echo '1,$p') ed - file1

EXTERNAL INFLUENCES

International Code Set Support

Single- and multi-byte character code sets are supported.

WARNINGS

Text lines that consist of a single period (.) defeat -e.

Files longer than 64K bytes do not work.

FILES

/var/tmp/d3*

/usr/lbin/diff3prog