Mercurial > hg
diff tests/test-resolve.t @ 46418:dc00324e80f4
errors: use StateError more in merge module
Differential Revision: https://phab.mercurial-scm.org/D9912
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 29 Jan 2021 15:56:08 -0800 |
parents | 0c95b59a89f1 |
children | 5a0b930cfb3e |
line wrap: on
line diff
--- a/tests/test-resolve.t Fri Jan 29 12:16:55 2021 -0800 +++ b/tests/test-resolve.t Fri Jan 29 15:56:08 2021 -0800 @@ -153,15 +153,15 @@ $ hg up 0 abort: outstanding merge conflicts (use 'hg resolve' to resolve) - [255] + [20] $ hg merge 2 abort: outstanding merge conflicts (use 'hg resolve' to resolve) - [255] + [20] $ hg merge --force 2 abort: outstanding merge conflicts (use 'hg resolve' to resolve) - [255] + [20] set up conflict-free merge