carta

submerge(1) on Linux

The text 590c3d1fe011, as Debian 4.0 (Etch) shipped it.

Graphical merge tool for text files.

submerge(1) on Linux now