tests/test-issue1175.t

--- a/tests/test-issue1175.t	Fri Apr 10 19:58:34 2020 +0200
+++ b/tests/test-issue1175.t	Tue Apr 14 19:09:56 2020 -0400
@@ -74,7 +74,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use 'hg resolve' and 'hg graft --continue')
-  [255]
+  [1]
   $ echo a > b
   $ echo b3 >> b
   $ hg resolve --mark b