durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8561 AFFECTED FILES mercurial/hg.py CHANGE DETAILS diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -33,7 +33,6 @@ logcmdutil, logexchange, merge as mergemod, - mergestate as mergestatemod, narrowspec, node, phases, @@ -1165,7 +1164,7 @@ def abortmerge(ui, repo): - ms = mergestatemod.mergestate.read(repo) + ms = repo[None].mergestate() if ms.active(): # there were conflicts node = ms.localctx.hex() To: durin42, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
