merge: update doc of manifestmerge() per 18c2184c27dc
p1 was renamed to wctx by 18c2184c27dc.
--- a/mercurial/merge.py Sat Oct 08 17:22:40 2016 +0200
+++ b/mercurial/merge.py Sun Oct 02 17:31:32 2016 +0900
@@ -781,7 +781,7 @@
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