Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 31042:705ecab649ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: add pointer how to narrow list of resolved/unresolved files (issue5469)
author Yuya Nishihara <yuya@tcha.org>
date Sat, 18 Feb 2017 18:00:01 +0900
parents 334cf948c758
children 0b8356705de6
line wrap: on
line diff
--- 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::