Mercurial > hg-stable
changeset 26195:5a3338e0faf7
help: filesets show hg resolve command
| author | timeless@mozdev.org |
|---|---|
| date | Tue, 08 Sep 2015 11:35:22 -0400 |
| parents | fc65d63ef3b9 |
| children | 3a4620ad4490 |
| files | mercurial/fileset.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/fileset.py Tue Sep 08 11:30:01 2015 -0400 +++ b/mercurial/fileset.py Tue Sep 08 11:35:22 2015 -0400 @@ -243,7 +243,7 @@ def resolved(mctx, x): """``resolved()`` - File that is marked resolved according to the resolve state. + File that is marked resolved according to :hg:`resolve -l`. """ # i18n: "resolved" is a keyword getargs(x, 0, 0, _("resolved takes no arguments")) @@ -254,7 +254,7 @@ def unresolved(mctx, x): """``unresolved()`` - File that is marked unresolved according to the resolve state. + File that is marked unresolved according to :hg:`resolve -l`. """ # i18n: "unresolved" is a keyword getargs(x, 0, 0, _("unresolved takes no arguments"))