# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1444895876 25200
# 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 -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."""