[PATCH 2 of 2] help: filesets show hg resolve command

timeless at mozdev.org timeless at mozdev.org
Tue Sep 8 12:52:41 CDT 2015


# HG changeset patch
# User timeless at mozdev.org
# Date 1441726522 14400
#      Tue Sep 08 11:35:22 2015 -0400
# Node ID 79079707ab1dbf7f4f9a10f1469302c72c96adaa
# Parent  edec87d17ccf0034c93a624a0d59f8e2db2f55bc
help: filesets show hg resolve command

diff --git a/mercurial/fileset.py b/mercurial/fileset.py
--- a/mercurial/fileset.py
+++ b/mercurial/fileset.py
@@ -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"))


More information about the Mercurial-devel mailing list