

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


NNNAAAMMMEEE
     merge - three-way file merge

SSSYYYNNNOOOPPPSSSIIISSS
     mmmeeerrrgggeee [ ---LLL _l_a_b_e_l_1 [ ---LLL _l_a_b_e_l_3 ] ] [ ---ppp ] [ ---qqq ] _f_i_l_e_1 _f_i_l_e_2 _f_i_l_e_3

DDDEEESSSCCCRRRIIIPPPTTTIIIOOONNN
     mmmeeerrrgggeee incorporates all changes that lead from _f_i_l_e_2 to _f_i_l_e_3 into  _f_i_l_e_1.
     The  result  goes  to  standard  output  if  ---ppp  is  present,  into _f_i_l_e_1
     otherwise.   mmmeeerrrgggee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mmeeerrrgggee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mmeeerrrgggeee  outputs  a message if overlaps occurred, and
     includes both alternatives in the result.  The alternatives are delimited
     as follows:

          <<<<<<<<<<<<<<<<<<<<< _f_i_l_e_1
          _l_i_n_e_s _i_n _f_i_l_e_1
          =====================
          _l_i_n_e_s _i_n _f_i_l_e_3
          >>>>>>>>>>>>>>>>>>>>> _f_i_l_e_3

     If there are overlaps, the user should edit the result and delete one  of
     the  alternatives.   If  the ---LLL\ _l_a_b_e_l_1 and ---LLL\ _l_a_b_e_l_3 options are given,
     the labels are output in place of the names _f_i_l_e_1 and  _f_i_l_e_3  in  overlap
     reports.  Any overlap message is suppressed if the ---qqq option is given.

DDDIIIAAAGGGNNNOOOSSSTTTIIICCCSSS
     Exit status is 0 for no overlaps, 1 for some overlaps, 2 for trouble.

IIIDDDEEENNNTTTIIIFFFIIICCCAAATTTIIIOOONNN
     Author: Walter F. Tichy.
     Revision Number: 5.1; Release Date: 1990/08/29.
     Copyright (c) 1982, 1988, 1989 by Walter F. Tichy.
     Copyright (c) 1990 by Paul Eggert.

SSSEEEEEE AAALLLSSSOOO
     diff3(1), diff(1), rcsmerge(1), co(1).


















                                    \*(Dt                                    1

