# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1479781959 18000
# Node ID d528ddc11b33ea678312dc06b6d3b7723cc68c20
# Parent  c1149533676ba3005bc859da47d7bb1e191d04b0
rebase: refer to checkunresolved by its new name

diff -r c1149533676b -r d528ddc11b33 hgext/rebase.py
--- 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: