commands: update the resolve command to handle path conflicts
The resolve command must support displaying path conflicts and marking
them as resolved or unresolved.
Differential Revision: https://phab.mercurial-scm.org/D775
#require docutils gettext
$ $TESTDIR/check-gendoc ru
checking for parse errors