Mercurial support manual-conflict-resolution. =)