equal
deleted
inserted
replaced
850 def extsetup(ui): |
850 def extsetup(ui): |
851 cmdutil.unfinishedstates.append( |
851 cmdutil.unfinishedstates.append( |
852 [shelvedstate._filename, False, False, |
852 [shelvedstate._filename, False, False, |
853 _('unshelve already in progress'), |
853 _('unshelve already in progress'), |
854 _("use 'hg unshelve --continue' or 'hg unshelve --abort'")]) |
854 _("use 'hg unshelve --continue' or 'hg unshelve --abort'")]) |
|
855 cmdutil.afterresolvedstates.append( |
|
856 [shelvedstate._filename, _('hg unshelve --continue')]) |