4.3BSD-UWisc/man/catl/merge.l

MERGE(1)            UNIX Programmer's Manual             MERGE(1)



NAME
     merge - three-way file merge

SYNOPSIS
     merge [ -p ] file1 file2 file3

DESCRIPTION
     _M_e_r_g_e incorporates all changes that lead form _f_i_l_e_2 to _f_i_l_e_3
     into _f_i_l_e_1. The result goes to std. output if -p is present,
     into _f_i_l_e_1 otherwise. _M_e_r_g_e is useful for combining separate
     changes to an original. Suppose _f_i_l_e_2 is the original, and
     both _f_i_l_e_1 and _f_i_l_e_3 are modifications of _f_i_l_e_2. Then _m_e_r_g_e
     combines both changes.

     An overlap occurs if both _f_i_l_e_1 and _f_i_l_e_3 have changes in a
     common segment of lines.  _M_e_r_g_e prints how many overlaps
     occurred, and includes both alternatives in the result. The
     alternatives are delimited as follows:

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

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

IDENTIFICATION
     Author: Walter F. Tichy, Purdue University, West Lafayette,
     IN, 47907.
     Revision Number: 3.0 ; Release Date: 82/11/25 .
     Copyright 8c9 1982 by Walter F. Tichy.

SEE ALSO
     diff3 (1), diff (1), rcsmerge (1), co (1).



















Printed 1/10/87              6/29/83                            1