# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-11-17 23:43:21
# Node ID 1791f9aa782f5bc7ba3e262eb4c67815541dac4c
# Parent  bf3eec62212f79021c16fc0b6ed075d503201d6f

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):