equal
deleted
inserted
replaced
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 """ |