Manual Reference Pages - MERGE (1)
merge - three-way file merge
file1 file2 file3
merge incorporates all changes that lead from
file1. The result ordinarily goes into
merge is useful for combining separate changes to an original. Suppose
file2 is the original, and both
file3 are modifications of
merge combines both changes.
A conflict occurs if both
file3 have changes in a common segment of lines.
If a conflict is found,
merge normally outputs a warning and brackets the conflict with
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
Output conflicts using the
-A style of
if supported by
diff3. This merges all changes leading from
file1, and generates the most verbose output.
These options specify conflict styles that generate less information
The default is
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.
merge -L x -L y -L z a b c generates output that looks like it came from files
z instead of from files
Send results to standard output instead of overwriting
Quiet; do not warn about conflicts.
Print RCSs version number.
Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble.
Author: Walter F. Tichy.
Manual Page Revision: 50472; Release Date: 1999-08-27.
Copyright © 1982, 1988, 1989 Walter F. Tichy.
Copyright © 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
diff3(1), diff(1), rcsmerge(1), co(1).
It normally does not make sense to merge binary files as if they were text, but
merge tries to do it anyway.
Visit the GSP FreeBSD Man Page Interface.
Output converted with manServer 1.07.