equal
deleted
inserted
replaced
1131 mresult.updateactions(fractions) |
1131 mresult.updateactions(fractions) |
1132 |
1132 |
1133 prunedactions = sparse.filterupdatesactions( |
1133 prunedactions = sparse.filterupdatesactions( |
1134 repo, wctx, mctx, branchmerge, mresult.actions |
1134 repo, wctx, mctx, branchmerge, mresult.actions |
1135 ) |
1135 ) |
|
1136 mresult.setactions(prunedactions) |
1136 _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult) |
1137 _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult) |
1137 |
1138 |
1138 mresult.setactions(prunedactions) |
|
1139 return mresult |
1139 return mresult |
1140 |
1140 |
1141 |
1141 |
1142 def _getcwd(): |
1142 def _getcwd(): |
1143 try: |
1143 try: |