diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -2891,6 +2891,9 @@ return scmutil.status(modified, added, removed, [], [], [], []) + def mergestate(self): + return mergestatemod.memmergestate(self._repo, self) + def parents(self): if self._parents[1].node() == nullid: return [self._parents[0]]