changeset 34146 | 9e4f82bc2b0b |
parent 34025 | 626a28f30dbd |
child 34198 | 402efa8421b8 |
--- a/tests/test-shelve.t Tue Sep 12 19:27:01 2017 -0700 +++ b/tests/test-shelve.t Mon Sep 11 17:49:49 2017 +0000 @@ -1260,7 +1260,7 @@ unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') [1] $ ls .hg/origbackups - root.orig + root $ rm -rf .hg/origbackups test Abort unshelve always gets user out of the unshelved state