diff -r 768056549737 -r dc00324e80f4 tests/test-rename-dir-merge.t
--- a/tests/test-rename-dir-merge.t	Fri Jan 29 12:16:55 2021 -0800
+++ b/tests/test-rename-dir-merge.t	Fri Jan 29 15:56:08 2021 -0800
@@ -110,7 +110,7 @@
   $ hg merge 2
   b/c: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
-  [255]
+  [20]
   $ cat b/c
   target
 but it should succeed if the content matches