d-up the files). The default is
  to mark all unresolved files.

- :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
  default is to mark all resolved files.

- :hg:`resolve -l`: list files which had or still have conflicts.
  In the printed list, ``U`` = unresolved and ``R`` = resolved.
  You can use ``set:unresolved()`` or ``set:resolved()`` to filter
  the list. See :hg:`help filesets` for details.

.. note::

   Mercurial will not let you commit files with unresolved merge
   conflicts. You must use :hg:`resolve -m ...` before you can
   commit after a conflicting merge.

.. container:: verbose

  Template:

  The following keywords are supported in addition to the common template
  keywords and functions. See also :hg:`help templates`.

  :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
  :path:    String. Repository-absolute path of the file.

Returns 0 on success, 1 if any files fail a resolve attempt.
rk