merge(1) on Linux
The text c036936a600f, as Debian 6.0 (Squeeze), Debian 5.0 (Lenny) shipped it.
three-way file merge
Flags it lists
-
-A -
-E -
-V -
-e -
-p -
-q