Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: correct argument name in docstring
authorAnton Shestakov <av6@dwimlabs.net>
Tue, 04 Jun 2019 17:24:35 +0800
changeset 42412 127937874395
parent 42411 4738c292a520
child 42415 c767e655ffda
merge: correct argument name in docstring Differential Revision: https://phab.mercurial-scm.org/D6476
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Fri May 31 15:28:31 2019 -0700
+++ b/mercurial/merge.py	Tue Jun 04 17:24:35 2019 +0800
@@ -2202,7 +2202,7 @@
     pctx - merge base, usually ctx.p1()
     labels - merge labels eg ['local', 'graft']
     keepparent - keep second parent if any
-    keepparent - if unresolved, keep parent used for the merge
+    keepconflictparent - if unresolved, keep parent used for the merge
 
     """
     # If we're grafting a descendant onto an ancestor, be sure to pass
Mercurial