diff --git a/mercurial/merge.py b/mercurial/merge.py index 8429369eeb850d1eb9243da3367bf1bd9d31f560_bWVyY3VyaWFsL21lcmdlLnB5..f4a27c05c43f78c4a94d7749ee6039df6bce33d3_bWVyY3VyaWFsL21lcmdlLnB5 100644 --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -329,6 +329,13 @@ if entry[0] == 'u': yield f + def driverresolved(self): + """Obtain the paths of driver-resolved files.""" + + for f, entry in self._state.items(): + if entry[0] == 'd': + yield f + def _resolve(self, preresolve, dfile, wctx, labels=None): """rerun merge process for file path `dfile`""" if self[dfile] in 'rd':