shelve: clear merge state after partial shelve

Differential Revision: https://phab.mercurial-scm.org/D9335

mercurial/shelve.py

@@ -564,6 +564,10 b' def _docreatecmd(ui, repo, pats, opts):'
                 scmutil.movedirstate(repo, parent, match)
         else:
             hg.update(repo, parent.node())
+            ms = mergestatemod.mergestate.read(repo)
+            if not ms.unresolvedcount():
+                ms.reset()
+
         if origbranch != repo[b'.'].branch() and not _isbareshelve(pats, opts):
             repo.dirstate.setbranch(origbranch)
 

tests/test-shelve.t

@@ -810,9 +810,8 b' Test interactive shelve'
   ? foo/foo
   $ hg bookmark
    \* test                      (4|13):33f7f61e6c5e (re)
-BROKEN: there shouldn't be a merge state
+there shouldn't be a merge state
   $ hg resolve -l
-  R a/a
   $ hg unshelve
   unshelving change 'test'
   temporarily committing pending changes (restore with 'hg unshelve --abort')