equal
deleted
inserted
replaced
1365 ) |
1365 ) |
1366 |
1366 |
1367 for f, op in pycompat.iteritems(mresult.commitinfo): |
1367 for f, op in pycompat.iteritems(mresult.commitinfo): |
1368 # the other side of filenode was choosen while merging, store this in |
1368 # the other side of filenode was choosen while merging, store this in |
1369 # mergestate so that it can be reused on commit |
1369 # mergestate so that it can be reused on commit |
1370 if op[b'filenode-source'] == b'other': |
1370 ms.addcommitinfo(f, op) |
1371 ms.addmergedother(f) |
|
1372 |
1371 |
1373 moves = [] |
1372 moves = [] |
1374 |
1373 |
1375 # 'cd' and 'dc' actions are treated like other merge conflicts |
1374 # 'cd' and 'dc' actions are treated like other merge conflicts |
1376 mergeactions = list( |
1375 mergeactions = list( |