--- a/tests/test-rename-after-merge.t	Wed Oct 21 19:00:16 2020 -0700
+++ b/tests/test-rename-after-merge.t	Tue Oct 06 22:36:15 2020 -0700
@@ -124,10 +124,10 @@
 
   $ hg copy --forget --at-rev . b2
   abort: cannot mark/unmark copy in merge commit
-  [255]
+  [10]
 
   $ hg copy --after --at-rev . b1 b2
   abort: cannot mark/unmark copy in merge commit
-  [255]
+  [10]
 
   $ cd ..