diff3(1) [v7 man page]

DIFF3(1)						      General Commands Manual							  DIFF3(1)

NAME

       diff3 - 3-way differential file comparison

SYNOPSIS

       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 differ

       ====1	       file1 is different

       ====2	       file2 is different

       ====3	       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:

       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.

       Under the -e option, diff3 publishes a script for the editor ed that will incorporate into file1 all changes between file2 and file3,  i.e.
       the  changes  that  normally  would  be	flagged ==== and ====3.  Option -x (-3) produces a script to incorporate only changes flagged ====
       (====3).  The following command will apply the resulting script to `file1'.

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

FILES

       /tmp/d3?????
       /usr/lib/diff3

SEE ALSO

       diff(1)

BUGS

       Text lines that consist of a single `.' will defeat -e.
       Files longer than 64K bytes won't work.

																	  DIFF3(1)

diff3(1)						      General Commands Manual							  diff3(1)

NAME

       diff3 - 3-way differential file comparison

SYNOPSIS

       file1 file2 file3

DESCRIPTION

       compares three versions of a file, and prints disagreeing ranges of text flagged with these codes:

	      all three files differ
	      file1	is different
	      file2	is different
	      file3	is different

       The type of change required to convert 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
			     n1 in file f, where f = or

	      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 indication.  When the contents of two files are identical, the contents of
       the lower-numbered file is suppressed.

	      Produces a script for the
			editor that can be used to incorporate into file1 all changes between file2 and file3 (see ed(1)); i.e., the changes  that
			normally would be flagged and

	      Produces a script to incorporate only changes flagged

	      Produces a script to incorporate only changes flagged

	      Produces a script that will incorporate all
			changes  between  file2  and  file3,  but treat overlapping changes (that is, changes that would be flagged with in normal
			listing) differently. The overlapping lines in both files will be inserted by the edit script bracketed by and lines.

	      Produces a script that will incorporate only changes flagged
			, but treat these changes in the manner of option.

       The following command applies the resulting script to 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

       Files longer than 64K bytes do not work.

FILES

SEE ALSO

       diff(1).

																	  diff3(1)