carta

SVK::Resolve(3pm) on Linux

The text f80b20a933a5, as Debian 3.1 (Sarge) shipped it.

Interactively resolve conflicts

SVK::Resolve(3pm) on Linux now