Category : Miscellaneous Language Source Code
Archive   : RCS56DOS.ZIP
Filename : MERGE.MAN

Output of file : MERGE.MAN contained in archive : RCS56DOS.ZIP


merge - three-way file merge

mmeerrggee [ --LL _l_a_b_e_l_1 [ --LL _l_a_b_e_l_3 ] ] [ --pp ] [ --qq ] _f_i_l_e_1
_f_i_l_e_2 _f_i_l_e_3

mmeerrggee 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
--pp is present, into _f_i_l_e_1 otherwise. mmeerrggee 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 mmeerrggee 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. On a few older hosts where
ddiiffff33 does not support the --EE option, mmeerrggee does not
detect overlaps, and merely supplies the changed lines
from _f_i_l_e_3. On most hosts, if overlaps occur, mmeerrggee
outputs a message (unless the --qq option is given), 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 --LL _l_a_b_e_l_1 and
--LL _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.

Exit status is 0 for no overlaps, 1 for some overlaps, 2
for trouble.

Author: Walter F. Tichy.
Revision Number: 5.4; Release Date: 1992/02/17.
Copyright 1982, 1988, 1989 by Walter F. Tichy.
Copyright 1990, 1991 by Paul Eggert.

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

GNU 1992/02/17 1

  3 Responses to “Category : Miscellaneous Language Source Code
Archive   : RCS56DOS.ZIP
Filename : MERGE.MAN

  1. Very nice! Thank you for this wonderful archive. I wonder why I found it only now. Long live the BBS file archives!

  2. This is so awesome! 😀 I’d be cool if you could download an entire archive of this at once, though.

  3. But one thing that puzzles me is the “mtswslnkmcjklsdlsbdmMICROSOFT” string. There is an article about it here. It is definitely worth a read: