equal
deleted
inserted
replaced
194 'graft', fname='graftstate', clearable=True, stopflag=True, |
194 'graft', fname='graftstate', clearable=True, stopflag=True, |
195 continueflag=True, |
195 continueflag=True, |
196 cmdhint=_("use 'hg graft --continue' or 'hg graft --stop' to stop") |
196 cmdhint=_("use 'hg graft --continue' or 'hg graft --stop' to stop") |
197 ) |
197 ) |
198 addunfinished( |
198 addunfinished( |
|
199 'unshelve', fname='shelvedstate', continueflag=True, |
|
200 cmdmsg=_('unshelve already in progress') |
|
201 ) |
|
202 addunfinished( |
199 'update', fname='updatestate', clearable=True, |
203 'update', fname='updatestate', clearable=True, |
200 cmdmsg=_('last update was interrupted'), |
204 cmdmsg=_('last update was interrupted'), |
201 cmdhint=_("use 'hg update' to get a consistent checkout"), |
205 cmdhint=_("use 'hg update' to get a consistent checkout"), |
202 statushint=_("To continue: hg update") |
206 statushint=_("To continue: hg update") |
203 ) |
207 ) |