carta

SVK::Resolve(3pm) on Linux

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

Interactively resolve conflicts

SVK::Resolve(3pm) on Linux now