diff3(1) on OpenBSD
The text 6b51547062e2, as OpenBSD 3.8, OpenBSD 3.7, OpenBSD 3.6 shipped it.
3-way differential file comparison
Flags it lists
-
-3 -
-E -
-X -
-a -
-e -
-x