--- 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