##// END OF EJS Templates
rebase: refer to checkunresolved by its new name
Augie Fackler -
r30495:d528ddc1 default
parent child Browse files
Show More
@@ -38,6 +38,7 b' from mercurial import ('
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,
@@ -665,7 +666,7 b' def rebase(ui, repo, **opts):'
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:
General Comments 0
You need to be logged in to leave comments. Login now