merge(1) on OpenBSD
The text 796601b4fba7, as OpenBSD 8.0-current (2026-11-01), OpenBSD 8.0, OpenBSD 7.9, OpenBSD 7.8, OpenBSD 7.7, OpenBSD 7.6, OpenBSD 7.5, OpenBSD 7.4, OpenBSD 7.3, OpenBSD 7.2, OpenBSD 7.1, OpenBSD 7.0, OpenBSD 6.9, OpenBSD 6.8, OpenBSD 6.7, OpenBSD 6.6, OpenBSD 6.5, OpenBSD 6.4 shipped it. The page shows this text now.
3-way file merge
Flags it lists
-
-E -
-L -
-V -
-e -
-p -
-q