hgext/shelve.py
changeset 38619 9b077e5fa8ba
parent 38618 c829749e7639
child 38714 abcf500d527c
--- a/hgext/shelve.py	Tue May 29 00:30:50 2018 +0200
+++ b/hgext/shelve.py	Tue Jun 05 12:04:15 2018 +0200
@@ -772,7 +772,7 @@
     with repo.ui.configoverride(overrides, 'unshelve'):
         ui.status(_('rebasing shelved changes\n'))
         stats = merge.graft(repo, shelvectx, shelvectx.p1(),
-                           labels=['dest', 'source'],
+                           labels=['shelve', 'working-copy'],
                            keepconflictparent=True)
         if stats.unresolvedcount:
             tr.close()