Mercurial > hg-stable

changeset 26992:b3b5ed560283

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: switch to mergestate.read() See previous patches for why we're doing this.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 17 Nov 2015 13:56:10 -0800
parents 2ddc92bae4a7
children d240ae897ba6
files hgext/shelve.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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"),