diff3(1) on OpenBSD
The text a505bba85e43, as OpenBSD 4.1, OpenBSD 4.0, OpenBSD 3.9 shipped it.
3-way differential file comparison
Flags it lists
-
-3 -
-E -
-X -
-a -
-e -
-x