tests/test-rebase-parameters.t

--- a/tests/test-rebase-parameters.t	Fri Feb 08 16:28:24 2013 -0600
+++ b/tests/test-rebase-parameters.t	Fri Feb 08 16:27:59 2013 -0600
@@ -416,7 +416,7 @@
   $ cd b3
 
   $ hg rebase -s 2 -d 1 --tool internal:fail
-  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
   $ hg resolve -l