# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-11-18 23:04:03
# Node ID 5cf184398ee76bc24a8709b25fef689523ecbf31
# Parent  e5be48dd8215c63e6b79c2926d707e9b3ff2c504

unshelve: add -k as short form of --keep

For parity with strip -k, rebase -k, etc.

diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -572,7 +572,7 @@ def unshelvecontinue(ui, repo, state, op
            _('abort an incomplete unshelve operation')),
           ('c', 'continue', None,
            _('continue an incomplete unshelve operation')),
-          ('', 'keep', None,
+          ('k', 'keep', None,
            _('keep shelve after unshelving')),
           ('', 'date', '',
            _('set date for temporary commits (DEPRECATED)'), _('DATE'))],
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -493,7 +493,7 @@ test keep and cleanup
   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)