branch | stable |
changeset 21947 | b081decd9062 |
parent 21852 | 37a5decc6924 |
child 22183 | 4dd9f606d0a6 |
child 22842 | d43d116a118c |
--- a/tests/test-shelve.t Fri Jul 25 15:51:42 2014 -0500 +++ b/tests/test-shelve.t Sat Jul 26 03:32:49 2014 +0200 @@ -308,7 +308,7 @@ $ hg revert -r . a/a $ hg resolve -m a/a - no more unresolved files + (no more unresolved files) $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress