changeset 38341 | 50f5fc232c16 |
parent 38338 | 2313a3599e41 |
child 38462 | 61e4cf1be5b2 |
--- a/tests/test-shelve.t Fri Jun 15 16:32:31 2018 -0700 +++ b/tests/test-shelve.t Wed Jun 13 22:50:32 2018 +0530 @@ -354,8 +354,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # To continue: hg unshelve --continue - # To abort: hg unshelve --abort + # To continue: hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts