OpenBSD manual page server

Manual Page Search Parameters

MERGE(1) General Commands Manual MERGE(1)

merge3-way file merge

merge [-EepqV] [-L label] file1 file2 file3

The merge program merges changes leading from file2 to file3 into file1.

The following options are supported:

Default merge: see diff3(1) for details.
Same as -E but does not warn about conflicts.
Specifies labels to be used in place of corresponding file names in conflict reports. May be given up to three times.
Print result to standard output.
Be quiet about reporting.
Print RCS's version number.

Using labels:

$ merge -q -p -L one -L two -L three file1 file2 file3
<<<<<<< one
>>>>>>> three

The merge utility exits with one of the following values:

No overlaps.
Overlaps were found.
An error occurred.

co(1), diff(1), diff3(1), rcsmerge(1)

The flag [-A] has no effect and is provided for compatibility only.

October 28, 2010 OpenBSD-5.9