mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
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:
parent
0eb994cb79
commit
f4dc777bce
@ -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."""
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user