merge(1)                            CLIX                            merge(1)



  NAME

    merge - Produces a three-way file merge

  SYNOPSIS

    merge [-p] [-q] [-L label1 [-L label3]]file1 file2 file3

  FLAGS

    -L label1    Prints the supplied label1 in place of the file1 name in the
                 overlap messages.

    -L label3    Prints the supplied label3 in place of the file3 name in the
                 overlap messages.

    -p           Sends the results to stdout instead of file1.

    -q           Suppresses overlap messages.

  DESCRIPTION

    The merge command incorporates all changes that lead from file2 to file3
    in file1 unless the -p flag is given.  The merge command is useful for
    combining separate changes to an original.  Suppose file2 is the original
    and both file1 and file3 are modifications of file2; the merge command
    would then combine both sets of changes (see CAUTIONS about overlapping
    changes).

  EXAMPLES

    merge file1 file2 file3


  CAUTIONS

    An overlap occurs if two files contain changes in a common segment of
    lines.  The merge command displays how many overlaps occurred and includes
    both alternatives in the result.  If file1 and file3 have overlapping
    changes, the alternatives are delimited as follows:

    <<<<<<< file1
    lines in file1
    =======
    lines in file3
    >>>>>>> file3

    If overlaps occur, the user should edit the result and delete one of the
    alternatives.

  EXIT VALUES



  2/94 - Intergraph Corporation                                              1

  merge(1)                            CLIX                            merge(1)



    The merge command exits with one of the following exit values:

    0   No overlaps to report.

    1   Some overlaps were reported.

    2   An error occurred.

  RELATED INFORMATION

    Commands:  diff(1), diff3(1), rcsmerge(1), co(1)











































  2                                              Intergraph Corporation - 2/94