--- a/tests/test-rebase-bookmarks.t	Fri Feb 08 16:28:24 2013 -0600
+++ b/tests/test-rebase-bookmarks.t	Fri Feb 08 16:27:59 2013 -0600
@@ -141,7 +141,7 @@
   merging c
   warning: conflicts during merge.
   merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
-  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
   $ echo 'c' > c
   $ hg resolve --mark c