--- a/tests/test-resolve.t Tue Nov 17 15:51:09 2020 -0800
+++ b/tests/test-resolve.t Thu Oct 22 14:14:59 2020 -0700
@@ -495,7 +495,7 @@
> EOF
re-merge all unresolved files (yn)? n
abort: user quit
- [255]
+ [250]
$ hg resolve --all << EOF
> y
@@ -523,7 +523,7 @@
> EOF
mark all unresolved files as resolved (yn)? n
abort: user quit
- [255]
+ [250]
$ hg resolve -m << EOF
> y
@@ -551,7 +551,7 @@
> EOF
mark all resolved files as unresolved (yn)? n
abort: user quit
- [255]
+ [250]
$ hg resolve -m << EOF
> y