Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 26766:a83110faece1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 15 Oct 2015 00:57:56 -0700
parents 45976219eb80
children ac68769a5985
line wrap: on
line diff
--- 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."""