Mercurial > hg-stable

changeset 36989:afac8ab37c2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: drop redundant import of merge module
author Yuya Nishihara <yuya@tcha.org>
date Sun, 18 Mar 2018 12:54:03 +0900
parents 66e64681e0a8
children 4b744c7b35ce
files mercurial/cmdutil.py
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Sun Mar 11 21:36:28 2018 +0900
+++ b/mercurial/cmdutil.py	Sun Mar 18 12:54:03 2018 +0900
@@ -2358,8 +2358,6 @@
             if subs:
                 subrepoutil.writestate(repo, newsubstate)
 
-        # avoid cycle (TODO: should be removed in default branch)
-        from . import merge as mergemod
         ms = mergemod.mergestate.read(repo)
         mergeutil.checkunresolved(ms)