--- a/tests/test-shelve.t Fri Dec 03 21:50:25 2021 -0800
+++ b/tests/test-shelve.t Thu Dec 02 22:59:36 2021 -0800
@@ -1385,8 +1385,8 @@
unshelving change 'default-01'
rebasing shelved changes
merging bar1
+ warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark')
merging bar2
- 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')
[240]