diff -r 5c2a4f37eace -r 16c361152133 tests/test-bisect.t
--- a/tests/test-bisect.t	Fri Apr 10 19:58:34 2020 +0200
+++ b/tests/test-bisect.t	Tue Apr 14 19:09:56 2020 -0400
@@ -564,7 +564,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use 'hg resolve' and 'hg graft --continue')
-  [255]
+  [1]
   $ hg bisect --reset
   $ hg up -C .
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved