##// END OF EJS Templates
merge: update doc of manifestmerge() per 18c2184c27dc...
Yuya Nishihara -
r30096:98d3d810 default
parent child Browse files
Show More
@@ -781,7 +781,7 b' def driverconclude(repo, ms, wctx, label'
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
General Comments 0
You need to be logged in to leave comments. Login now