ucbdiff3(1)                                           ucbdiff3(1)



NAME
     ucbdiff3 - reports the differences between three files

SYNOPSIS
     ucbdiff3 [-e] [-E] [-x[-3]] [-X[-3]] ver1 ver2 ver3

ARGUMENTS
     -e   Publishes a script for the ed editor that will
          incorporate into ver1 all changes between ver2 and ver3
          (the changes that would normally be flagged ==== and
          ====3).

     -E   Publishes a script for the ed editor that will
          incorporate into ver1 all changes between ver2 and
          ver3, but treat overlapping changes (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.

     ver1 ver2 ver3
          Specifies three versions of a file.

     -x[-3]
          Produces a script to incorporate only the changes
          flagged ==== (====3).

     -X[-3]
          Produces a script to incorporate only the changes that
          would be flagged ==== (====3), in the normal listing
          differently.  The changes from both files will be
          inserted by the edit script, bracketed by <<<<<< and
          >>>>>> lines.

DESCRIPTION
     ucbdiff3 is used by the rcs Revision Control System.  The
     ucbdiff3 command compares three versions of a file and
     publishes disagreeing ranges of text flagged with these
     codes.

     ====      all three files differ

     ====1     ver1 is different

     ====2     ver2 is different

     ====3     ver3 is different

     The type of change suffered in converting a given range of a
     given file to some other is indicated in one of two ways:

     f:n1a     Appends text after line number n1 in file f, where



January 1992                                                    1

ucbdiff3(1)                                           ucbdiff3(1)



               f = 1, 2, or 3.

     f:n1,n2c  Changes text 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.

EXAMPLES
     Suppose lines 7-8 are changed in both ver1 and ver2.
     Applying the edit script generated by the command

        ucbdiff3 -E ver1 ver2 ver3

     to ver1 results in the file:

        lines 1-6 of ver1
        <<<<<<< ver1
        lines 7-8 of ver1
        =======
        lines 7-8 of ver3
        >>>>>>> ver3
        rest of ver1

     The -E option is used by RCS merge to insure that
     overlapping changes in the merged files are preserved and
     brought to someone's attention.

LIMITATIONS
     Text lines that consist of a single period (.) will defeat
     the -e option.

FILES
     /usr/ucb/ucbdiff3
          Executable file
     /tmp/d3?????
          Temporary file
     /usr/lib/ucbdiff3
          Library file

SEE ALSO
     diff(1), diff3(1), rcs(1), ucbdiff(1)











2                                                    January 1992