Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/shelve.py
branchstable
changeset 44332 69b091cdc506
parent 43981 414cb20e241e
child 44374 f5c006621f07 
--- a/mercurial/shelve.py	Thu Feb 20 17:06:01 2020 -0800
+++ b/mercurial/shelve.py	Thu Feb 20 16:21:00 2020 -0800
@@ -997,7 +997,7 @@
             repo,
             shelvectx,
             shelvectx.p1(),
-            labels=[b'shelve', b'working-copy'],
+            labels=[b'working-copy', b'shelve'],
             keepconflictparent=True,
         )
         if stats.unresolvedcount:
mercurial