9 merge \- three-way file merge
15 .I "file1 file2 file3"
18 incorporates all changes that lead from
24 The result ordinarily goes into
27 is useful for combining separate changes to an original. Suppose
29 is the original, and both
37 combines both changes.
39 A conflict occurs if both
43 have changes in a common segment of lines.
44 If a conflict is found,
46 normally outputs a warning and brackets the conflict with
51 A typical conflict will look like this:
63 If there are conflicts, the user should edit the result and delete one of the
68 Output conflicts using the
74 This merges all changes leading from
80 and generates the most verbose output.
83 These options specify conflict styles that generate less information
94 does not warn about conflicts.
97 This option may be given up to three times, and specifies labels
98 to be used in place of the corresponding file names in conflict reports.
100 .B "merge\ \-L\ x\ \-L\ y\ \-L\ z\ a\ b\ c"
101 generates output that looks like it came from files
106 instead of from files
113 Send results to standard output instead of overwriting
117 Quiet; do not warn about conflicts.
120 Print \*r's version number.
122 Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble.
124 Author: Walter F. Tichy.
126 Manual Page Revision: \*(Rv; Release Date: \*(Dt.
128 Copyright \(co 1982, 1988, 1989 Walter F. Tichy.
130 Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
132 diff3(1), diff(1), rcsmerge(1), co(1).
134 It normally does not make sense to merge binary files as if they were text, but
136 tries to do it anyway.