tests/test-update-branches.t

--- a/tests/test-update-branches.t	Mon Nov 23 16:20:02 2020 -0800
+++ b/tests/test-update-branches.t	Mon Nov 23 16:48:13 2020 -0800
@@ -348,7 +348,7 @@
   $ rm a.orig
   $ hg ci -m empty
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
   $ hg resolve -m a
   (no more unresolved files)
   $ hg resolve -l