carta

merge(1) on OpenBSD

The text 5d4185ee4118, as OpenBSD 6.3, OpenBSD 6.2, OpenBSD 6.1, OpenBSD 6.0, OpenBSD 5.9, OpenBSD 5.8, OpenBSD 5.7, OpenBSD 5.6, OpenBSD 5.5, OpenBSD 5.4, OpenBSD 5.3, OpenBSD 5.2, OpenBSD 5.1, OpenBSD 5.0, OpenBSD 4.9 shipped it.

3-way file merge

Flags it lists

merge(1) on OpenBSD now