diff -r a4f008612727 -r a67d2e059a51 tests/test-histedit-edit.t
--- a/tests/test-histedit-edit.t	Fri Dec 11 07:08:36 2015 +0000
+++ b/tests/test-histedit-edit.t	Sun Dec 27 03:33:09 2015 +0000
@@ -459,7 +459,7 @@
   > EOF
   $ HGEDITOR="sh ../edit.sh" hg histedit 2
   warning: histedit rules saved to: .hg/histedit-last-edit.txt
-  abort: cannot fold into public change 18aa70c8ad22
+  hg: parse error: cannot fold into public change 18aa70c8ad22
   [255]
   $ cat .hg/histedit-last-edit.txt
   fold 0012be4a27ea 2 extend a