changeset 42695 | 52a383451739 |
parent 42691 | ee86ad6f50fe |
child 42724 | 4814d993fe21 |
--- a/tests/test-shelve.t Mon Jul 29 13:22:52 2019 +0300 +++ b/tests/test-shelve.t Tue Jul 30 21:36:15 2019 +0530 @@ -1347,6 +1347,12 @@ $ hg resolve -m bar1 bar2 (no more unresolved files) continue: hg unshelve --continue + +-- using --continue with --interactive should throw an error + $ hg unshelve --continue -i + abort: cannot use both continue and interactive + [255] + $ cat bar1 A B