changeset 31022 | 705ecab649ea |
parent 30999 | 334cf948c758 |
child 31024 | 0b8356705de6 |
--- a/mercurial/commands.py Sun Feb 19 10:56:08 2017 +0100 +++ b/mercurial/commands.py Sat Feb 18 18:00:01 2017 +0900 @@ -4259,6 +4259,8 @@ - :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::