Mercurial > hg

changeset 42412:127937874395

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: correct argument name in docstring Differential Revision: https://phab.mercurial-scm.org/D6476
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 04 Jun 2019 17:24:35 +0800
parents 4738c292a520
children c767e655ffda
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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