merge(1) on OpenBSD
The text f7043069a638, as OpenBSD 4.8, OpenBSD 4.7, OpenBSD 4.6, OpenBSD 4.5, OpenBSD 4.4, OpenBSD 4.3, OpenBSD 4.2 shipped it.
3-way file merge
Flags it lists
-
-E -
-L -
-V -
-e -
-p -
-q