BSD 4_4 development

[unix-history] / usr / contrib / man / cat1 / merge.0

MERGE(1)               BSD Reference Manual              MERGE(1)


N\bNA\bAM\bME\bE
      merge - three-way file merge

S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS
      m\bme\ber\brg\bge\be  [  -\b-L\bL  _\bl_\ba_\bb_\be_\bl_\b1  [  -\b-L\bL _\bl_\ba_\bb_\be_\bl_\b3 ] ] [ -\b-p\bp ] [ -\b-q\bq ] _\bf_\bi_\bl_\be_\b1
      _\bf_\bi_\bl_\be_\b2 _\bf_\bi_\bl_\be_\b3

D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
      m\bme\ber\brg\bge\be incorporates all changes that  lead  from  _\bf_\bi_\bl_\be_\b2  to
      _\bf_\bi_\bl_\be_\b3  into  _\bf_\bi_\bl_\be_\b1.  The result goes to standard output if
      -\b-p\bp is present, into _\bf_\bi_\bl_\be_\b1 otherwise.  m\bme\ber\brg\bge\be is useful  for
      combining  separate changes to an original.  Suppose _\bf_\bi_\bl_\be_\b2
      is the original, and both _\bf_\bi_\bl_\be_\b1 and  _\bf_\bi_\bl_\be_\b3  are  modifica-
      tions of _\bf_\bi_\bl_\be_\b2.  Then m\bme\ber\brg\bge\be combines both changes.

      An  overlap occurs if both _\bf_\bi_\bl_\be_\b1 and _\bf_\bi_\bl_\be_\b3 have changes in
      a common segment of lines.  On a  few  older  hosts  where
      d\bdi\bif\bff\bf3\b3  does  not  support  the  -\b-E\bE  option, m\bme\ber\brg\bge\be does not
      detect overlaps, and merely  supplies  the  changed  lines
      from  _\bf_\bi_\bl_\be_\b3_\b.  On most hosts, if overlaps occur, m\bme\ber\brg\bge\be out-
      puts a message  (unless  the  -\b-q\bq  option  is  given),  and
      includes  both  alternatives  in the result.  The alterna-
      tives are delimited as follows:

             <\b<<\b<<\b<<\b<<\b<<\b<<\b< _\bf_\bi_\bl_\be_\b1
             _\bl_\bi_\bn_\be_\bs _\bi_\bn _\bf_\bi_\bl_\be_\b1
             =\b==\b==\b==\b==\b==\b==\b=
             _\bl_\bi_\bn_\be_\bs _\bi_\bn _\bf_\bi_\bl_\be_\b3
             >\b>>\b>>\b>>\b>>\b>>\b>>\b> _\bf_\bi_\bl_\be_\b3

      If there are overlaps, the user should edit the result and
      delete  one  of  the  alternatives.   If the -\b-L\bL _\bl_\ba_\bb_\be_\bl_\b1 and
      -\b-L\bL _\bl_\ba_\bb_\be_\bl_\b3 options are given,  the  labels  are  output  in
      place of the names _\bf_\bi_\bl_\be_\b1 and _\bf_\bi_\bl_\be_\b3 in overlap reports.

D\bDI\bIA\bAG\bGN\bNO\bOS\bST\bTI\bIC\bCS\bS
      Exit  status  is 0 for no overlaps, 1 for some overlaps, 2
      for trouble.

I\bID\bDE\bEN\bNT\bTI\bIF\bFI\bIC\bCA\bAT\bTI\bIO\bON\bN
      Author: Walter F. Tichy.
      Revision Number: 5.3; Release Date: 1991/02/28.
      Copyright (C) 1982, 1988, 1989 by Walter F. Tichy.
      Copyright (C) 1990, 1991 by Paul Eggert.

S\bSE\bEE\bE A\bAL\bLS\bSO\bO
      diff3(1), diff(1), rcsmerge(1), co(1).







GNU                         1991/02/28                          1