diff -r 0890e6fd3e00 -r 838c6b72928d tests/test-rebase-mq-skip.t
--- a/tests/test-rebase-mq-skip.t	Sun May 12 15:35:53 2013 +0400
+++ b/tests/test-rebase-mq-skip.t	Tue May 14 23:04:23 2013 +0400
@@ -108,8 +108,8 @@
   $ hg up -q qtip
 
   $ HGMERGE=internal:fail hg rebase
-  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
-  [255]
+  unresolved conflicts (see hg resolve, then hg rebase --continue)
+  [1]
 
   $ HGMERGE=internal:local hg resolve --all