carta

merge(1) on Linux

The text d3ab013cb129, as Debian 7 (Wheezy) shipped it.

three-way file merge

Flags it lists

merge(1) on Linux now