# HG changeset patch
# User Yuya Nishihara <y...@tcha.org>
# Date 1475397092 -32400
# Sun Oct 02 17:31:32 2016 +0900
# Node ID 1fcc4a460a7e86aea018e06e776048e149b36f78
# Parent cd7276f7ea8308df2c5d8874d335d73247d0f357
merge: update doc of manifestmerge() per 18c2184c27dc
p1 was renamed to wctx by 18c2184c27dc.
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -781,7 +781,7 @@ def driverconclude(repo, ms, wctx, label
def manifestmerge(repo, wctx, p2, pa, branchmerge, force, matcher,
acceptremote, followcopies):
"""
- Merge p1 and p2 with ancestor pa and generate merge action list
+ Merge wctx and p2 with ancestor pa and generate merge action list
branchmerge and force are as passed in to update
matcher = matcher to filter file lists
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
