--- a/tests/test-merge1.t Thu Oct 22 13:31:34 2020 -0700
+++ b/tests/test-merge1.t Mon Oct 12 12:44:18 2020 -0700
@@ -36,7 +36,7 @@
$ hg ci
abort: last update was interrupted
(use 'hg update' to get a consistent checkout)
- [255]
+ [20]
$ hg sum
parent: 0:538afb845929
commit #0