# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 2019-06-04 09:24:35
# Node ID 12793787439538411013edffe0f9b98762d38a37
# Parent  4738c292a52072cc6f6a54b5d4066720509dec55

merge: correct argument name in docstring

Differential Revision: https://phab.mercurial-scm.org/D6476

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -2202,7 +2202,7 @@ def graft(repo, ctx, pctx, labels=None, 
     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