--- 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)