diff -r 8f07f5a9c3de -r 21733e8c924f tests/test-histedit-fold.t
--- a/tests/test-histedit-fold.t	Sat Nov 07 21:50:28 2020 -0800
+++ b/tests/test-histedit-fold.t	Wed Oct 21 19:00:16 2020 -0700
@@ -291,7 +291,7 @@
   warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
   Fix up the change (fold 251d831eeec5)
   (hg histedit --continue to resume)
-  [1]
+  [240]
 There were conflicts, we keep P1 content. This
 should effectively drop the changes from +6.
 
@@ -364,7 +364,7 @@
   warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
   Fix up the change (fold 251d831eeec5)
   (hg histedit --continue to resume)
-  [1]
+  [240]
   $ cat > file << EOF
   > 1
   > 2