changeset 21266 | 19d6fec60b81 |
parent 21264 | 4e932dc5c113 |
child 21267 | e4f451c8c05c |
--- a/tests/test-shelve.t Fri Apr 18 18:56:26 2014 -0700 +++ b/tests/test-shelve.t Fri Apr 18 22:19:25 2014 -0700 @@ -294,6 +294,7 @@ $ hg revert -r . a/a $ hg resolve -m a/a + no unresolved files; you may continue your unfinished operation $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress