325     def unresolved(self):

   325     def unresolved(self):

   326         """Obtain the paths of unresolved files."""

   326         """Obtain the paths of unresolved files."""

   327 

   327 

   328         for f, entry in self._state.items():

   328         for f, entry in self._state.items():

   329             if entry[0] == 'u':

   329             if entry[0] == 'u':

   330                 yield f

   337                 yield f

   331 

   338 

   332     def _resolve(self, preresolve, dfile, wctx, labels=None):

   339     def _resolve(self, preresolve, dfile, wctx, labels=None):

   333         """rerun merge process for file path `dfile`"""

   340         """rerun merge process for file path `dfile`"""

   334         if self[dfile] in 'rd':

   341         if self[dfile] in 'rd':