5c5
< .Id $Id: merge.1,v 5.3 1991/02/28 19:18:45 eggert Exp $
---
> .Id $Id: merge.1,v 5.7 1995/06/01 16:23:43 eggert Exp $
12,20c12
< .B \-L
< .I label1
< [
< .B \-L
< .I label3
< ] ] [
< .B \-p
< ] [
< .B \-q
---
> .I "options"
31,35c23,24
< The result goes to standard output if
< .B \-p
< is present, into
< .I file1
< otherwise.
---
> The result ordinarily goes into
> .IR file1 .
49c38
< An overlap occurs if both
---
> A conflict occurs if both
54,58c43
< On a few older hosts where
< .B diff3
< does not support the
< .B \-E
< option,
---
> If a conflict is found,
60,68c45,50
< does not detect overlaps, and merely supplies the changed lines from
< .I file3.
< On most hosts, if overlaps occur,
< .B merge
< outputs a message (unless the
< .B \-q
< option is given),
< and includes both alternatives
< in the result. The alternatives are delimited as follows:
---
> normally outputs a warning and brackets the conflict with
> .B <<<<<<<
> and
> .B >>>>>>>
> lines.
> A typical conflict will look like this:
72,73c54,55
< .BI <<<<<<< " file1"
< .I "lines in file1"
---
> .BI <<<<<<< " file A"
> .I "lines in file A"
75,76c57,58
< .I "lines in file3"
< .BI >>>>>>> " file3"
---
> .I "lines in file B"
> .BI >>>>>>> " file B"
80c62
< If there are overlaps, the user should edit the result and delete one of the
---
> If there are conflicts, the user should edit the result and delete one of the
82,83c64,102
< If the
< .BI \-L "\ label1"
---
> .SH OPTIONS
> .TP
> .B \-A
> Output conflicts using the
> .B \-A
> style of
> .BR diff3 (1),
> if supported by
> .BR diff3 .
> This merges all changes leading from
> .I file2
> to
> .I file3
> into
> .IR file1 ,
> and generates the most verbose output.
> .TP
> \f3\-E\fP, \f3\-e\fP
> These options specify conflict styles that generate less information
> than
> .BR \-A .
> See
> .BR diff3 (1)
> for details.
> The default is
> .BR \-E .
> With
> .BR \-e ,
> .B merge
> does not warn about conflicts.
> .TP
> .BI \-L " label"
> This option may be given up to three times, and specifies labels
> to be used in place of the corresponding file names in conflict reports.
> That is,
> .B "merge\ \-L\ x\ \-L\ y\ \-L\ z\ a\ b\ c"
> generates output that looks like it came from files
> .BR x ,
> .B y
85,87c104,107
< .BI \-L "\ label3"
< options are given, the labels are output in place of the names
< .I file1
---
> .B z
> instead of from files
> .BR a ,
> .B b
89,90c109,118
< .I file3
< in overlap reports.
---
> .BR c .
> .TP
> .BI \-p
> Send results to standard output instead of overwriting
> .IR file1 .
> .TP
> .BI \-q
> Quiet; do not warn about conflicts.
> .BI \-V
> Print \*r's version number.
92c120
< Exit status is 0 for no overlaps, 1 for some overlaps, 2 for trouble.
---
> Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble.
96c124
< Revision Number: \*(Rv; Release Date: \*(Dt.
---
> Manual Page Revision: \*(Rv; Release Date: \*(Dt.
98c126
< Copyright \(co 1982, 1988, 1989 by Walter F. Tichy.
---
> Copyright \(co 1982, 1988, 1989 Walter F. Tichy.
100c128
< Copyright \(co 1990, 1991 by Paul Eggert.
---
> Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
102a131,135
> .SH BUGS
> It normally does not make sense to merge binary files as if they were text, but
> .B merge
> tries to do it anyway.
> .br