diff mercurial/shelve.py @ 48592:bcc4820242cf

shelve: attempt to make merge labels more helpful

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

--- a/mercurial/shelve.py	Fri Jan 21 13:48:18 2022 -0800
+++ b/mercurial/shelve.py	Fri Jan 21 13:49:11 2022 -0800
@@ -1000,7 +1000,11 @@
         stats = merge.graft(
             repo,
             shelvectx,
-            labels=[b'working-copy', b'shelve'],
+            labels=[
+                b'working-copy',
+                b'shelved change',
+                b'parent of shelved change',
+            ],
             keepconflictparent=True,
         )
         if stats.unresolvedcount: