##// END OF EJS Templates
help: filesets show hg resolve command
timeless@mozdev.org -
r26195:5a3338e0 default
parent child Browse files
Show More
@@ -243,7 +243,7 b' def symlink(mctx, x):'
243
243
244 def resolved(mctx, x):
244 def resolved(mctx, x):
245 """``resolved()``
245 """``resolved()``
246 File that is marked resolved according to the resolve state.
246 File that is marked resolved according to :hg:`resolve -l`.
247 """
247 """
248 # i18n: "resolved" is a keyword
248 # i18n: "resolved" is a keyword
249 getargs(x, 0, 0, _("resolved takes no arguments"))
249 getargs(x, 0, 0, _("resolved takes no arguments"))
@@ -254,7 +254,7 b' def resolved(mctx, x):'
254
254
255 def unresolved(mctx, x):
255 def unresolved(mctx, x):
256 """``unresolved()``
256 """``unresolved()``
257 File that is marked unresolved according to the resolve state.
257 File that is marked unresolved according to :hg:`resolve -l`.
258 """
258 """
259 # i18n: "unresolved" is a keyword
259 # i18n: "unresolved" is a keyword
260 getargs(x, 0, 0, _("unresolved takes no arguments"))
260 getargs(x, 0, 0, _("unresolved takes no arguments"))
General Comments 0
You need to be logged in to leave comments. Login now