changeset 27019 | 5cf184398ee7 |
parent 26952 | 4e566f513fd8 |
child 27021 | f2554154509f |
--- a/tests/test-shelve.t Sun Nov 01 13:55:21 2015 +0900 +++ b/tests/test-shelve.t Wed Nov 18 15:04:03 2015 -0800 @@ -493,7 +493,7 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg shelve --list default (*) changes to 'create conflict' (glob) - $ hg unshelve --keep + $ hg unshelve -k unshelving change 'default' $ hg shelve --list default (*) changes to 'create conflict' (glob)