Submitter | Bryan O'Sullivan |
---|---|
Date | May 28, 2013, 11:28 p.m. |
Message ID | <0f4397fbda5b3cd7e4de.1369783734@australite.thefacebook.com> |
Download | mbox | patch |
Permalink | /patch/1669/ |
State | Superseded |
Commit | 9bfa86746c9c1f6ab51deb8f174ffc482417d09f |
Headers | show |
Comments
Patch
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