Mercurial > hg

changeset 30496:a90867a22daf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: refer to checkunresolved by its new name
author Augie Fackler <augie@google.com>
date Mon, 21 Nov 2016 21:32:55 -0500
parents d528ddc11b33
children 002fa4d79466
files mercurial/localrepo.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Mon Nov 21 21:32:39 2016 -0500
+++ b/mercurial/localrepo.py	Mon Nov 21 21:32:55 2016 -0500
@@ -28,7 +28,6 @@
     bundle2,
     changegroup,
     changelog,
-    cmdutil,
     context,
     dirstate,
     dirstateguard,
@@ -42,6 +41,7 @@
     manifest,
     match as matchmod,
     merge as mergemod,
+    mergeutil,
     namespaces,
     obsolete,
     pathutil,
@@ -1630,7 +1630,7 @@
                 raise error.Abort(_("cannot commit merge with missing files"))
 
             ms = mergemod.mergestate.read(self)
-            cmdutil.checkunresolved(ms)
+            mergeutil.checkunresolved(ms)
 
             if editor:
                 cctx._text = editor(self, cctx, subs)