carta

diffuse(1) on Linux

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

graphical tool for merging and comparing text files

Flags it lists

diffuse(1) on Linux now