--- a/tests/test-shelve.t Sat Nov 07 21:50:28 2020 -0800
+++ b/tests/test-shelve.t Wed Oct 21 19:00:16 2020 -0700
@@ -366,7 +366,7 @@
merging a/a
warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
- [1]
+ [240]
$ hg status -v
M a/a
M b.rename/b
@@ -484,7 +484,7 @@
$ hg unshelve -q
warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
- [1]
+ [240]
attempt to continue
@@ -705,7 +705,7 @@
merging a/a
warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
- [1]
+ [240]
$ hg bookmark
test (4|13):33f7f61e6c5e (re)
@@ -1387,7 +1387,7 @@
warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark')
warning: conflicts while merging bar2! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
- [1]
+ [240]
$ cat > bar1 <<EOF
> A