Patchwork D6476: merge: correct argument name in docstring

login
register
mail settings
Submitter phabricator
Date June 4, 2019, 2:09 p.m.
Message ID <e7b9d303adf923221ff0cfa5ac5db0c5@localhost.localdomain>
Download mbox | patch
Permalink /patch/40309/
State Not Applicable
Headers show

Comments

phabricator - June 4, 2019, 2:09 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG127937874395: merge: correct argument name in docstring (authored by av6, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6476?vs=15332&id=15333

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: av6, #hg-reviewers, pulkit
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