--- a/tests/test-merge9.t Wed Oct 21 19:00:16 2020 -0700
+++ b/tests/test-merge9.t Tue Oct 06 22:36:15 2020 -0700
@@ -78,7 +78,7 @@
$ hg resolve
abort: no files or directories specified
(use --all to re-merge all unresolved files)
- [255]
+ [10]
resolve all
$ hg resolve -a