Mercurial > public > mercurial-scm > hg-stable
diff tests/test-simplemerge.py @ 48576:374bf34c9ffd
simplemerge: make merge_groups() yield only 2-tuples
`merge_groups()` currently yields 2-tuples or 4-tuples, making the
callers check the first element to decide how to interpret the
rest. Let's make it yield only 2-tuples, thereby simplifying life a
little for the callers.
Differential Revision: https://phab.mercurial-scm.org/D11966
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 06 Jan 2022 09:03:17 -0800 |
| parents | 98e3a693061a |
| children | ce8c82a5cd65 |
line wrap: on
line diff
--- a/tests/test-simplemerge.py Fri Jan 07 14:40:21 2022 +0100 +++ b/tests/test-simplemerge.py Thu Jan 06 09:03:17 2022 -0800 @@ -285,7 +285,7 @@ list(m3.merge_groups()), [ (b'unchanged', [b'aaa\n']), - (b'conflict', [], [b'111\n'], [b'222\n']), + (b'conflict', ([], [b'111\n'], [b'222\n'])), (b'unchanged', [b'bbb\n']), ], )