home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
OS/2 Shareware BBS: 22 gnu
/
22-gnu.zip
/
rcs567x.zip
/
doc
/
merge.man
< prev
next >
Wrap
Text File
|
1994-03-22
|
4KB
|
133 lines
MERGE(1) MERGE(1)
NNAAMMEE
merge - three-way file merge
SSYYNNOOPPSSIISS
mmeerrggee [ _o_p_t_i_o_n_s ] _f_i_l_e_1 _f_i_l_e_2 _f_i_l_e_3
DDEESSCCRRIIPPTTIIOONN
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 ordinarily goes into _f_i_l_e_1.
mmeerrggee is useful for combining separate changes to an orig-
inal. 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.
A conflict occurs if both _f_i_l_e_1 and _f_i_l_e_3 have changes in
a common segment of lines. If a conflict is found, mmeerrggee
normally outputs a warning and brackets the conflict with
<<<<<<<<<<<<<< and >>>>>>>>>>>>>> lines. A typical conflict will look
like this:
<<<<<<<<<<<<<< _f_i_l_e _A
_l_i_n_e_s _i_n _f_i_l_e _A
==============
_l_i_n_e_s _i_n _f_i_l_e _B
>>>>>>>>>>>>>> _f_i_l_e _B
If there are conflicts, the user should edit the result
and delete one of the alternatives.
OOPPTTIIOONNSS
--AA Output conflicts using the --AA style of ddiiffff33(1), if
supported by ddiiffff33. This merges all changes lead-
ing from _f_i_l_e_2 to _f_i_l_e_3 into _f_i_l_e_1, and is usually
the best choice for merging. This option is the
default if ddiiffff33 supports it.
--EE, --ee These options specify conflict styles that generate
less information than --AA. See ddiiffff33(1) for
details. If ddiiffff33 does not support --AA, then --EE is
the default if it is supported, and --ee is other-
wise. With --ee, mmeerrggee does not warn about con-
flicts.
--LL _l_a_b_e_l
This option may be given up to three times, and
specifies labels to be used in place of the corre-
sponding file names in conflict reports. That is,
mmeerrggee --LL xx --LL yy --LL zz aa bb cc generates output that
looks like it came from files xx, yy and zz instead of
from files aa, bb and cc.
--pp Send results to standard output instead of over-
writing _f_i_l_e_1.
GNU 1993/11/09 1
MERGE(1) MERGE(1)
--qq Quiet; do not warn about conflicts. --VV Print 's
version number.
DDIIAAGGNNOOSSTTIICCSS
Exit status is 0 for no conflicts, 1 for some conflicts, 2
for trouble.
IIDDEENNTTIIFFIICCAATTIIOONN
Author: Walter F. Tichy.
Manual Page Revision: 5.6; Release Date: 1993/11/09.
Copyright (C) 1982, 1988, 1989 Walter F. Tichy.
Copyright (C) 1990, 1991, 1992, 1993 Paul Eggert.
SSEEEE AALLSSOO
diff3(1), diff(1), rcsmerge(1), co(1).
GNU 1993/11/09 2