Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: drop redundant import of merge module
authorYuya Nishihara <yuya@tcha.org>
Sun, 18 Mar 2018 12:54:03 +0900
changeset 36986 afac8ab37c2c
parent 36985 66e64681e0a8
child 36987 4b744c7b35ce
cmdutil: drop redundant import of merge module
mercurial/cmdutil.py file | annotate | diff | comparison | revisions 
--- 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)
mercurial