Mercurial > hg
diff tests/test-resolve.t @ 45840:527ce85c2e60
errors: introduce StateError and use it from commands and cmdutil
This very similar to an earlier patch (which was for `InputError`).
In this patch, I also updated the transplant extension only because
`test-transplant.t` would otherwise have needed a `#if continueflag`.
Differential Revision: https://phab.mercurial-scm.org/D9310
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 12 Oct 2020 12:44:18 -0700 |
parents | 8d72e29ad1e0 |
children | ac362d5a7893 |
line wrap: on
line diff
--- a/tests/test-resolve.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-resolve.t Mon Oct 12 12:44:18 2020 -0700 @@ -132,13 +132,13 @@ $ hg resolve --all abort: resolve command not applicable when not merging - [255] + [20] resolve -m should abort when no merge in progress $ hg resolve -m abort: resolve command not applicable when not merging - [255] + [20] can not update or merge when there are unresolved conflicts @@ -332,7 +332,7 @@ file2 abort: conflict markers detected (use --all to mark anyway) - [255] + [20] $ hg resolve -l U file1 U file2