changeset 26997 | 1791f9aa782f |
parent 26969 | b54b520a24c2 |
child 27010 | f4fec0940278 |
--- 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):