# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-10-15 07:57:56
# Node ID a83110faece160ef81c22ecda2edeeffe288c894
# Parent  45976219eb80b0614356e205d0fa5083bc0df6af

merge.mergestate: add a way to get the merge driver state

This will be useful to check what the status of the merge driver is.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -329,6 +329,9 @@ class mergestate(object):
         self._state[dfile][0] = state
         self._dirty = True
 
+    def mdstate(self):
+        return self._mdstate
+
     def unresolved(self):
         """Obtain the paths of unresolved files."""