# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 2013-06-04 00:20:37
# Node ID feaf5749d7a42ccccd479eeda81016035e61621f
# Parent  8300adf9ca33a0e265ea04943a960b56481fb4ff

merge: add a files method to the mergestate class

This will be used in the upcoming shelve extension.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -61,6 +61,8 @@ class mergestate(object):
         l.sort()
         for f in l:
             yield f
+    def files(self):
+        return self._state.keys()
     def mark(self, dfile, state):
         self._state[dfile][0] = state
         self._dirty = True