diff -r e8aeeb28e35e -r 98d3d8108db0 mercurial/merge.py
--- 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