--- a/tests/test-shelve.t Wed Aug 09 17:01:21 2017 +0200
+++ b/tests/test-shelve.t Thu Aug 03 05:12:35 2017 +0530
@@ -342,6 +342,23 @@
warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1]
+ $ hg status -v
+ M a/a
+ M b.rename/b
+ M c.copy
+ R b/b
+ ? a/a.orig
+ # The repository is in an unfinished *unshelve* state.
+
+ # Unresolved merge conflicts:
+ #
+ # a/a
+ #
+ # To mark files as resolved: hg resolve --mark FILE
+
+ # To continue: hg unshelve --continue
+ # To abort: hg unshelve --abort
+
ensure that we have a merge with unresolved conflicts