Show More
@@ -329,6 +329,9 b' class mergestate(object):' | |||||
329 | self._state[dfile][0] = state |
|
329 | self._state[dfile][0] = state | |
330 | self._dirty = True |
|
330 | self._dirty = True | |
331 |
|
331 | |||
|
332 | def mdstate(self): | |||
|
333 | return self._mdstate | |||
|
334 | ||||
332 | def unresolved(self): |
|
335 | def unresolved(self): | |
333 | """Obtain the paths of unresolved files.""" |
|
336 | """Obtain the paths of unresolved files.""" | |
334 |
|
337 |
General Comments 0
You need to be logged in to leave comments.
Login now