[PATCH 08 of 10 layering] rebase: refer to checkunresolved by its new name

[Augie Fackler]

# HG changeset patch
# User Augie Fackler <augie at google.com>
# Date 1479781959 18000
#      Mon Nov 21 21:32:39 2016 -0500
# Node ID e289afbde6a86a818330fbf76802d31da158ec9b
# Parent  8cbc5499d3563877cf072f45c0c66328e8cc406b
rebase: refer to checkunresolved by its new name

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -38,6 +38,7 @@ from mercurial import (
     hg,
     lock,
     merge as mergemod,
+    mergeutil,
     obsolete,
     patch,
     phases,
@@ -665,7 +666,7 @@ def rebase(ui, repo, **opts):
                 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: