|MERGE(1)||General Commands Manual||MERGE(1)|
A conflict occurs if both file1 and file3 have changes in a common segment of lines. If a conflict is found, merge normally outputs a warning and brackets the conflict with <<<<<<< and >>>>>>> lines. A typical conflict will look like this:
<<<<<<< file A lines in file A ======= lines in file B >>>>>>> file B
If there are conflicts, the user should edit the result and delete one of the alternatives.
- Output conflicts using the -A style of diff3(1), if supported by diff3. This merges all changes leading from file2 to file3 into file1, and generates the most verbose output.
- -E, -e
- These options specify conflict styles that generate less information than -A. See diff3(1) for details. The default is -E. With -e, merge does not warn about conflicts.
- -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, merge -L x -L y -L z a b c generates output that looks like it came from files x, y and z instead of from files a, b and c.
- Send results to standard output instead of overwriting file1.
- Quiet; do not warn about conflicts.
- Print RCS's version number.
Manual Page Revision: 5.10.0; Release Date: 2020-10-20.
Copyright © 2010-2020 Thien-Thi Nguyen.
Copyright © 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
Copyright © 1982, 1988, 1989 Walter F. Tichy.
The full documentation for RCS is maintained as a Texinfo manual. If the info(1) and RCS programs are properly installed at your site, the command
- info rcs
should give you access to the complete manual. Additionally, the RCS homepage:
has news and links to the latest release, development site, etc.
|2020-10-20||GNU RCS 5.10.0|