equal
deleted
inserted
replaced
115 |
115 |
116 return action |
116 return action |
117 |
117 |
118 def manifestmerge(repo, p1, p2, pa, overwrite, partial): |
118 def manifestmerge(repo, p1, p2, pa, overwrite, partial): |
119 """ |
119 """ |
120 Merge p1 and p2 with ancestor ma and generate merge action list |
120 Merge p1 and p2 with ancestor pa and generate merge action list |
121 |
121 |
122 overwrite = whether we clobber working files |
122 overwrite = whether we clobber working files |
123 partial = function to filter file lists |
123 partial = function to filter file lists |
124 """ |
124 """ |
125 |
125 |