# HG changeset patch
# User Yuya Nishihara <y...@tcha.org>
# Date 1487408401 -32400
# Sat Feb 18 18:00:01 2017 +0900
# Node ID ceef988474afe31056a2d8fcef67526cf43c2d6f
# Parent 1ca3469fdd08c0d5d814a4bc359869bc157c7fc9
help: add pointer how to narrow list of resolved/unresolved files (issue5469)
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4259,6 +4259,8 @@ def resolve(ui, repo, *pats, **opts):
- :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-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
