Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
30095:e8aeeb28e35e 30096:98d3d8108db0
779 return True 779 return True
780 780
781 def manifestmerge(repo, wctx, p2, pa, branchmerge, force, matcher, 781 def manifestmerge(repo, wctx, p2, pa, branchmerge, force, matcher,
782 acceptremote, followcopies): 782 acceptremote, followcopies):
783 """ 783 """
784 Merge p1 and p2 with ancestor pa and generate merge action list 784 Merge wctx and p2 with ancestor pa and generate merge action list
785 785
786 branchmerge and force are as passed in to update 786 branchmerge and force are as passed in to update
787 matcher = matcher to filter file lists 787 matcher = matcher to filter file lists
788 acceptremote = accept the incoming changes without prompting 788 acceptremote = accept the incoming changes without prompting
789 """ 789 """