merge(1) on OpenBSD
The text c8d17eca1755, as OpenBSD 2.1 shipped it.
three-way file merge
Flags it lists
-
-A -
-E -
-e -
-p -
-q