carta

diff3(1) on OpenBSD

The text bb5d2bb6d714, as OpenBSD 3.4 shipped it.

3-way differential file comparison

Flags it lists

diff3(1) on OpenBSD now