equal
deleted
inserted
replaced
36 error, |
36 error, |
37 extensions, |
37 extensions, |
38 hg, |
38 hg, |
39 lock, |
39 lock, |
40 merge as mergemod, |
40 merge as mergemod, |
|
41 mergeutil, |
41 obsolete, |
42 obsolete, |
42 patch, |
43 patch, |
43 phases, |
44 phases, |
44 registrar, |
45 registrar, |
45 repair, |
46 repair, |
663 _('abort and continue do not allow specifying revisions')) |
664 _('abort and continue do not allow specifying revisions')) |
664 if abortf and opts.get('tool', False): |
665 if abortf and opts.get('tool', False): |
665 ui.warn(_('tool option will be ignored\n')) |
666 ui.warn(_('tool option will be ignored\n')) |
666 if contf: |
667 if contf: |
667 ms = mergemod.mergestate.read(repo) |
668 ms = mergemod.mergestate.read(repo) |
668 cmdutil.checkunresolved(ms) |
669 mergeutil.checkunresolved(ms) |
669 |
670 |
670 retcode = rbsrt._prepareabortorcontinue(abortf) |
671 retcode = rbsrt._prepareabortorcontinue(abortf) |
671 if retcode is not None: |
672 if retcode is not None: |
672 return retcode |
673 return retcode |
673 else: |
674 else: |