equal
deleted
inserted
replaced
1326 ('c', 'continue', False, 'continue interrupted pick'), |
1326 ('c', 'continue', False, 'continue interrupted pick'), |
1327 ('a', 'abort', False, 'abort interrupted pick'), |
1327 ('a', 'abort', False, 'abort interrupted pick'), |
1328 ], |
1328 ], |
1329 _('[-r] rev')) |
1329 _('[-r] rev')) |
1330 def cmdpick(ui, repo, *revs, **opts): |
1330 def cmdpick(ui, repo, *revs, **opts): |
1331 """grabs a commit, move it on the top of working directory parent and |
1331 """move a commit on the top of working directory parent and updates to it.""" |
1332 updates to it.""" |
|
1333 |
1332 |
1334 cont = opts.get('continue') |
1333 cont = opts.get('continue') |
1335 abort = opts.get('abort') |
1334 abort = opts.get('abort') |
1336 |
1335 |
1337 if cont and abort: |
1336 if cont and abort: |