diff3(1)                            CLIX                            diff3(1)



  NAME

    diff3 - Runs a 3-way differential file comparator

  SYNOPSIS

    diff3 [-ex3] file1 file2 file3

  FLAGS

    -e     Publishes a script for the editor ed that will incorporate into
           file1 all changes between file2 and file3, that is, the changes
           that normally would be flagged ==== and ====3.

    -x (-3)
           Produces a script to incorporate only the changes flagged ====
           (====3).  The following command will apply the resulting script to
           file1:

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


  DESCRIPTION

    The diff3 command 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.

  EXAMPLES



  2/94 - Intergraph Corporation                                              1

  diff3(1)                            CLIX                            diff3(1)



    Given the following three files:

    file1:

    line 1
    same for 1 and 2
    line 2
    same for 1 and 3
    line 3
    different for 1
    line 4
    different for 1

    file2:

    line 1
    same for 1 and 2
    line 2
    same for 1 and 3
    line 3
    different for 1
    line 4
    different for 1

    file 3:

    line 1
    different for 3
    line 2
    same for 1 and 3
    line 3
    same for 2 and 3
    line 4
    different for 3

    Entering the command:

    diff3 file1 file2 file3

    will produce the following output:

    ====3
    1:2c
    2:2c
      same for 1 and 2
    3:2c
      different for 3
    ====3
    1:6c
    2:6c
      different for 2



  2                                              Intergraph Corporation - 2/94

  diff3(1)                            CLIX                            diff3(1)



    3:4c
      same for 1 and 3
    ====3
    1:8c
    2:8c
      different for 1
    3:8c
      different for 3


  FILES

    /tmp/d3*

    /usr/lib/diff3prog

  NOTES

    Text lines that consist of a single . will defeat -e.

    Files longer than 64K bytes will not work.

  DIAGNOSTICS

    The message:

    diff3: too many changes

    indicates that the three files contain too many changes for diff3 to
    process.

  EXIT VALUES

    Exit values are not valid.

  RELATED INFORMATION

    Commands: diff(1)
















  2/94 - Intergraph Corporation                                              3