diff mercurial/filemerge.py @ 19285:feaf5749d7a4

merge: add a files method to the mergestate class This will be used in the upcoming shelve extension.
author Bryan O'Sullivan <bryano@fb.com>
date Mon, 03 Jun 2013 17:20:37 -0700
parents c58b6ab4c26f
children 89b2336e5ccf
line wrap: on
line diff