tests/test-rebase-detach.t

--- a/tests/test-rebase-detach.t	Fri Feb 08 16:28:24 2013 -0600
+++ b/tests/test-rebase-detach.t	Fri Feb 08 16:27:59 2013 -0600
@@ -372,7 +372,7 @@
   merging H
   warning: conflicts during merge.
   merging H 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]
   $ hg resolve --all -t internal:local
   $ hg rebase -c