diff -r 8f07f5a9c3de -r 21733e8c924f tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t	Sat Nov 07 21:50:28 2020 -0800
+++ b/tests/test-rebase-conflicts.t	Wed Oct 21 19:00:16 2020 -0700
@@ -67,7 +67,7 @@
   merging common
   warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
-  [1]
+  [240]
 
   $ hg status --config commands.status.verbose=1
   M common
@@ -345,7 +345,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
-  [1]
+  [240]
   $ hg diff
   diff -r 328e4ab1f7cc a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
@@ -365,7 +365,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
-  [1]
+  [240]
   $ hg diff
   diff -r 328e4ab1f7cc a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
@@ -403,7 +403,7 @@
   merging B
   warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
-  [1]
+  [240]
 
   $ echo 4 > B
   $ hg resolve -m
@@ -455,7 +455,7 @@
   merging conflict
   warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
-  [1]
+  [240]
   $ hg tglog
   @  8:draft 'E'
   |