tests/test-merge-remove.t

--- a/tests/test-merge-remove.t	Fri Jan 29 12:16:55 2021 -0800
+++ b/tests/test-merge-remove.t	Fri Jan 29 15:56:08 2021 -0800
@@ -95,7 +95,7 @@
   $ hg merge
   bar: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
-  [255]
+  [20]
   $ cat bar
   memories of buried pirate treasure