| changeset 48547 | 374bf34c9ffd |
| parent 46355 | 98e3a693061a |
| child 48556 | ce8c82a5cd65 |
| 48546:e91aa800ae5b | 48547:374bf34c9ffd |
|---|---|
283 |
283 |
284 self.assertEqual( |
284 self.assertEqual( |
285 list(m3.merge_groups()), |
285 list(m3.merge_groups()), |
286 [ |
286 [ |
287 (b'unchanged', [b'aaa\n']), |
287 (b'unchanged', [b'aaa\n']), |
288 (b'conflict', [], [b'111\n'], [b'222\n']), |
288 (b'conflict', ([], [b'111\n'], [b'222\n'])), |
289 (b'unchanged', [b'bbb\n']), |
289 (b'unchanged', [b'bbb\n']), |
290 ], |
290 ], |
291 ) |
291 ) |
292 |
292 |
293 ml = m3.merge_lines( |
293 ml = m3.merge_lines( |