diff -r 45976219eb80 -r a83110faece1 mercurial/merge.py --- a/mercurial/merge.py Thu Oct 15 00:49:07 2015 -0700 +++ b/mercurial/merge.py Thu Oct 15 00:57:56 2015 -0700 @@ -329,6 +329,9 @@ self._state[dfile][0] = state self._dirty = True + def mdstate(self): + return self._mdstate + def unresolved(self): """Obtain the paths of unresolved files."""