Mercurial > public > mercurial-scm > hg-stable

diff hgext/rebase.py @ 30504:d528ddc11b33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: refer to checkunresolved by its new name
author Augie Fackler <augie@google.com>
date Mon, 21 Nov 2016 21:32:39 -0500
parents ee2097c560c1
children 51e7c83e05ee
line wrap: on
line diff
--- 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: