changeset 30504 | d528ddc11b33 |
parent 30499 | ee2097c560c1 |
child 30585 | 51e7c83e05ee |
--- a/hgext/rebase.py Mon Nov 21 21:31:45 2016 -0500 +++ b/hgext/rebase.py Mon Nov 21 21:32:39 2016 -0500 @@ -38,6 +38,7 @@ hg, lock, merge as mergemod, + mergeutil, obsolete, patch, phases, @@ -665,7 +666,7 @@ ui.warn(_('tool option will be ignored\n')) if contf: ms = mergemod.mergestate.read(repo) - cmdutil.checkunresolved(ms) + mergeutil.checkunresolved(ms) retcode = rbsrt._prepareabortorcontinue(abortf) if retcode is not None: