diff mercurial/templatekw.py @ 41129:074c72a38423

merge with stable
author Augie Fackler <augie@google.com>
date Mon, 07 Jan 2019 19:03:23 -0500
parents d11e2c5b287e 70e3e3da24be
children 66102f6fa10a
line wrap: on
line diff
--- a/mercurial/templatekw.py	Mon Jan 07 15:25:41 2019 -0800
+++ b/mercurial/templatekw.py	Mon Jan 07 19:03:23 2019 -0500
@@ -586,7 +586,7 @@
 
 @templatekeyword("predecessors", requires={'repo', 'ctx'})
 def showpredecessors(context, mapping):
-    """Returns the list if the closest visible successors. (EXPERIMENTAL)"""
+    """Returns the list of the closest visible successors. (EXPERIMENTAL)"""
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
     predecessors = sorted(obsutil.closestpredecessors(repo, ctx.node()))
@@ -624,7 +624,7 @@
 @templatekeyword("successorssets", requires={'repo', 'ctx'})
 def showsuccessorssets(context, mapping):
     """Returns a string of sets of successors for a changectx. Format used
-    is: [ctx1, ctx2], [ctx3] if ctx has been splitted into ctx1 and ctx2
+    is: [ctx1, ctx2], [ctx3] if ctx has been split into ctx1 and ctx2
     while also diverged into ctx3. (EXPERIMENTAL)"""
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')