diff -r 232de244ab6f -r 19d6fec60b81 mercurial/merge.py --- a/mercurial/merge.py Fri Apr 18 18:56:26 2014 -0700 +++ b/mercurial/merge.py Fri Apr 18 22:19:25 2014 -0700 @@ -260,6 +260,13 @@ self._state[dfile][0] = state self._dirty = True + def unresolved(self): + """Obtain the paths of unresolved files.""" + + for f, entry in self._state.items(): + if entry[0] == 'u': + yield f + def resolve(self, dfile, wctx): """rerun merge process for file path `dfile`""" if self[dfile] == 'r':