merge(1) on OpenBSD
The text d02dae42b8d6, as OpenBSD 4.1, OpenBSD 4.0 shipped it.
3-way file merge
Flags it lists
-
-E -
-L -
-V -
-e -
-p -
-q