carta

diff3(1) on OpenBSD

The text 2030bc55d98d, as OpenBSD 3.5 shipped it.

3-way differential file comparison

Flags it lists

diff3(1) on OpenBSD now