incorporates all changes that lead from
The result ordinarily goes into
is useful for combining separate changes to an original. Suppose
is the original, and both
are modifications of
combines both changes.
A conflict occurs if both
have changes in a common segment of lines.
If a conflict is found,
normally outputs a warning and brackets the conflict with
A typical conflict will look like this:
<<<<<<< file Alines in file A=======lines in file B>>>>>>> file B
If there are conflicts, the user should edit the result and delete one of the
Output conflicts using the
if supported by
This merges all changes leading from
and generates the most verbose output.
These options specify conflict styles that generate less information
The default is
does not warn about conflicts.
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.
merge -L x -L y -L z a b c
generates output that looks like it came from files
instead of from files
Send results to standard output instead of overwriting
Quiet; do not warn about conflicts.
Print RCS's version number.
Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble.