Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-resolve.t: switch to mergestate.read()
authorSiddharth Agarwal <sid0@fb.com>
Tue, 17 Nov 2015 15:43:21 -0800
changeset 26997 1791f9aa782f
parent 26996 bf3eec62212f
child 26998 4414d500604f
test-resolve.t: switch to mergestate.read() See previous patches for why we're doing this.
tests/test-resolve.t file | annotate | diff | comparison | revisions 
--- 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):
Mercurial