mercurial/shelve.py

--- a/mercurial/shelve.py	Thu Feb 13 22:51:17 2020 -0500
+++ b/mercurial/shelve.py	Mon Feb 24 13:50:55 2020 -0500
@@ -996,7 +996,7 @@
         stats = merge.graft(
             repo,
             shelvectx,
-            labels=[b'shelve', b'working-copy'],
+            labels=[b'working-copy', b'shelve'],
             keepconflictparent=True,
         )
         if stats.unresolvedcount: