submerge(1) on Linux
The text 4bdb319261d7, as Debian 6.0 (Squeeze) shipped it.
Graphical merge tool for text files.
Flags it lists
-
--encoding -
--label -
--w+ -
--w- -
-L -
-e