--- a/tests/test-histedit-non-commute-abort.t	Fri Feb 08 16:27:59 2013 -0600
+++ b/tests/test-histedit-non-commute-abort.t	Fri Feb 08 16:27:49 2013 -0600
@@ -79,7 +79,7 @@
   merging e
   warning: conflicts during merge.
   merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
-  abort: Fix up the change and run hg histedit --continue
+  Fix up the change and run hg histedit --continue
 
 
 abort the edit