tests/test-update-branches.t
changeset 46418 dc00324e80f4
parent 45916 fa87536d3d70
child 48405 acdd4a42deaa
--- a/tests/test-update-branches.t	Fri Jan 29 12:16:55 2021 -0800
+++ b/tests/test-update-branches.t	Fri Jan 29 15:56:08 2021 -0800
@@ -324,7 +324,7 @@
   $ hg up -q 4
   abort: conflicting changes
   (commit or update --clean to discard changes)
-  [255]
+  [20]
   $ hg up -m 4
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')