Mercurial > public > mercurial-scm > hg

diff mercurial/shelve.py @ 44374:f5c006621f07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Mon, 24 Feb 2020 13:50:55 -0500
parents f546d2170b0f 69b091cdc506
children f0021fbedea9
line wrap: on
line diff
--- 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: