mercurial/merge.py
changeset 26766 a83110faece1
parent 26765 45976219eb80
child 26768 ac68769a5985
equal deleted inserted replaced
26765:45976219eb80 26766:a83110faece1
   326         return self._state.keys()
   326         return self._state.keys()
   327 
   327 
   328     def mark(self, dfile, state):
   328     def mark(self, dfile, state):
   329         self._state[dfile][0] = state
   329         self._state[dfile][0] = state
   330         self._dirty = True
   330         self._dirty = True
       
   331 
       
   332     def mdstate(self):
       
   333         return self._mdstate
   331 
   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 
   335         for f, entry in self._state.items():
   338         for f, entry in self._state.items():