--- a/tests/test-commit-unresolved.t Thu Oct 22 13:31:34 2020 -0700
+++ b/tests/test-commit-unresolved.t Mon Oct 12 12:44:18 2020 -0700
@@ -47,7 +47,7 @@
$ hg abort
abort: no merge in progress (abortflag !)
abort: no operation in progress (abortcommand !)
- [255]
+ [20]
$ hg merge
merging A