# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447797370 28800
# Node ID b3b5ed56028372364820b125c7d4eb3a3721db3a
# Parent  2ddc92bae4a719da39da1c3bbbb31c83846675ab
shelve: switch to mergestate.read()

See previous patches for why we're doing this.

diff -r 2ddc92bae4a7 -r b3b5ed560283 hgext/shelve.py
--- a/hgext/shelve.py	Tue Nov 17 13:55:30 2015 -0800
+++ b/hgext/shelve.py	Tue Nov 17 13:56:10 2015 -0800
@@ -531,7 +531,7 @@
     lock = None
     try:
         checkparents(repo, state)
-        ms = merge.mergestate(repo)
+        ms = merge.mergestate.read(repo)
         if [f for f in ms if ms[f] == 'u']:
             raise error.Abort(
                 _("unresolved conflicts, can't continue"),