merge(1) on Linux
The text f1cd91de6aeb, as Debian 8 (Jessie) shipped it.
three-way file merge
Flags it lists
-
-A -
-E -
-V -
-e -
-p -
-q