MERGE(1) | General Commands Manual | MERGE(1) |
merge
— 3-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:
-E
-e
-E
but does not warn about conflicts.-L
label-p
-q
-V
The merge
utility exits with one of the
following values:
Using labels:
$ 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-current |