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.
This commit is contained in:
Siddharth Agarwal 2015-10-15 00:57:56 -07:00
parent 0eb994cb79
commit f4dc777bce

View File

@ -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."""