merge—Three-way file merge
merge [ options ] file1 file2 file3
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.
|–A||Output conflicts using the –A style of diff3(1), if supported by diff3. This merges all changes leading from file2 to file3 into
|–E, –e||These options specify conflict styles that generate less information than –A. See diff3(1) for details. The default is –E.
|–L label||This option may be given up to three
|–p||Send results to standard output instead of overwriting file1.|
|–q||Quiet; do not warn about conflicts.|
|–V||Print RCS’s version number.|
Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble.