--- a/tests/test-rebase-check-restore.t Sat Nov 07 21:50:28 2020 -0800
+++ b/tests/test-rebase-check-restore.t Wed Oct 21 19:00:16 2020 -0700
@@ -70,7 +70,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]
Solve the conflict and go on:
@@ -127,7 +127,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]
Solve the conflict and go on: