diff -r ebee234d952a -r 527ce85c2e60 tests/test-merge5.t
--- a/tests/test-merge5.t	Thu Oct 22 13:31:34 2020 -0700
+++ b/tests/test-merge5.t	Mon Oct 12 12:44:18 2020 -0700
@@ -16,7 +16,7 @@
   $ rm b
   $ hg update -c 2
   abort: uncommitted changes
-  [255]
+  [20]
   $ hg revert b
   $ hg update -c 2
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved