[PATCH 7 of 7 mergedriver] test-resolve.t: switch to mergestate.read()

[Siddharth Agarwal]

# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1447803801 28800
#      Tue Nov 17 15:43:21 2015 -0800
# Node ID 9cb18faf8158bdd03e0d29e85f363f7d4e429ed8
# Parent  b117fd7573f85100dc93355a1cf0c0609d525aee
test-resolve.t: switch to mergestate.read()

See previous patches for why we're doing this.

diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -66,7 +66,7 @@ don't allow marking or unmarking driver-
   > 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):