tests/test-rebase-detach.t

--- a/tests/test-rebase-detach.t	Fri Feb 08 16:27:49 2013 -0600
+++ b/tests/test-rebase-detach.t	Fri Feb 08 16:17:46 2013 -0600
@@ -373,7 +373,7 @@
   warning: conflicts during merge.
   merging H incomplete! (edit conflicts, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
-  [255]
+  [1]
   $ hg resolve --all -t internal:local
   $ hg rebase -c
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob)