Mercurial > hg
diff tests/test-update-branches.t @ 45916:fa87536d3d70
errors: raise StateError when there are unresolves merge conflicts
Differential Revision: https://phab.mercurial-scm.org/D9392
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 23 Nov 2020 16:48:13 -0800 |
| parents | 8939062597f0 |
| children | dc00324e80f4 |
line wrap: on
line diff
--- a/tests/test-update-branches.t Mon Nov 23 16:20:02 2020 -0800 +++ b/tests/test-update-branches.t Mon Nov 23 16:48:13 2020 -0800 @@ -348,7 +348,7 @@ $ rm a.orig $ hg ci -m empty abort: unresolved merge conflicts (see 'hg help resolve') - [255] + [20] $ hg resolve -m a (no more unresolved files) $ hg resolve -l