Mercurial > hg-stable
changeset 26997:1791f9aa782f
test-resolve.t: switch to mergestate.read()
See previous patches for why we're doing this.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Tue, 17 Nov 2015 15:43:21 -0800 |
| parents | bf3eec62212f |
| children | 4414d500604f |
| files | tests/test-resolve.t |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-resolve.t Tue Nov 17 13:58:50 2015 -0800 +++ b/tests/test-resolve.t Tue Nov 17 15:43:21 2015 -0800 @@ -66,7 +66,7 @@ > def markdriver(ui, repo, *pats, **opts): > wlock = repo.wlock() > try: - > ms = merge.mergestate(repo) + > ms = merge.mergestate.read(repo) > m = scmutil.match(repo[None], pats, opts) > for f in ms: > if not m(f):