--- a/tests/test-shelve.t Tue Dec 09 03:45:26 2014 +0100
+++ b/tests/test-shelve.t Wed Dec 10 06:20:35 2014 +0100
@@ -387,6 +387,7 @@
rebasing shelved changes
rebasing 6:c5e6910e7601 "changes to 'second'" (tip)
merging a/a
+ note: rebase of 6:c5e6910e7601 created no changes to commit
$ hg parents -q
4:33f7f61e6c5e
$ hg shelve -l
@@ -724,6 +725,7 @@
(no more unresolved files)
$ hg unshelve -c
rebasing 5:4b555fdb4e96 "changes to 'second'" (tip)
+ note: rebase of 5:4b555fdb4e96 created no changes to commit
unshelve of 'default' complete
$ hg diff
$ hg status