# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1559640275 -28800
# Node ID 12793787439538411013edffe0f9b98762d38a37
# Parent  4738c292a52072cc6f6a54b5d4066720509dec55
merge: correct argument name in docstring

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

diff -r 4738c292a520 -r 127937874395 mercurial/merge.py
--- 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