|MERGE(1)||General Commands Manual||MERGE(1)|
merge — 3-way file
merge program merges changes leading
from file2 to file3 into
The following options are supported:
-Ebut does not warn about conflicts.
merge utility exits with one of the
$ merge -q -p -L one -L two -L three file1 file2 file3 <<<<<<< one ======= bar >>>>>>> three
The flag [
-A] has no effect and is
provided for compatibility only.
|June 7, 2018||OpenBSD-6.7|