--- a/tests/test-histedit-fold.t	Fri Feb 08 16:27:49 2013 -0600
+++ b/tests/test-histedit-fold.t	Fri Feb 08 16:17:46 2013 -0600
@@ -183,7 +183,7 @@
   warning: conflicts during merge.
   merging file incomplete! (edit conflicts, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
-  [255]
+  [1]
 There were conflicts, we keep P1 content. This
 should effectively drop the changes from +6.
   $ hg status
@@ -248,7 +248,7 @@
   warning: conflicts during merge.
   merging file incomplete! (edit conflicts, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
-  [255]
+  [1]
   $ cat > file << EOF
   > 1
   > 2