Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 30096:98d3d8108db0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: update doc of manifestmerge() per 18c2184c27dc p1 was renamed to wctx by 18c2184c27dc.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 02 Oct 2016 17:31:32 +0900
parents a145161debed
children 339f9d93daa6
line wrap: on
line diff
--- 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