Patchwork D6476: merge: correct argument name in docstring

login
register
mail settings
Submitter phabricator
Date June 4, 2019, 9:29 a.m.
Message ID <differential-rev-PHID-DREV-iyf46ircuc7hna4n5i2d-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/40308/
State Superseded
Headers show

Comments

phabricator - June 4, 2019, 9:29 a.m.
av6 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6476

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: av6, #hg-reviewers
Cc: mercurial-devel

Patch

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