Mercurial > hg
diff tests/test-update-branches.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 | fa87536d3d70 |
| children | acdd4a42deaa |
line wrap: on
line diff
--- a/tests/test-update-branches.t Fri Jan 29 12:16:55 2021 -0800 +++ b/tests/test-update-branches.t Fri Jan 29 15:56:08 2021 -0800 @@ -324,7 +324,7 @@ $ hg up -q 4 abort: conflicting changes (commit or update --clean to discard changes) - [255] + [20] $ hg up -m 4 merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark')