--- a/tests/test-shelve2.t	Thu Feb 20 17:06:01 2020 -0800
+++ b/tests/test-shelve2.t	Thu Feb 20 16:21:00 2020 -0800
@@ -253,11 +253,11 @@
   M f
   ? f.orig
   $ cat f
-  <<<<<<< shelve:       d44eae5c3d33 - shelve: pending changes temporary commit
+  <<<<<<< working-copy: d44eae5c3d33 - shelve: pending changes temporary commit
   g
   =======
   f
-  >>>>>>> working-copy: aef214a5229c - shelve: changes to: commit stuff
+  >>>>>>> shelve:       aef214a5229c - shelve: changes to: commit stuff
   $ cat f.orig
   g
   $ hg unshelve --abort -t false
@@ -295,11 +295,11 @@
   M f
   ? f.orig
   $ cat f
-  <<<<<<< shelve:       6b563750f973 - test: intermediate other change
+  <<<<<<< working-copy: 6b563750f973 - test: intermediate other change
   g
   =======
   f
-  >>>>>>> working-copy: aef214a5229c - shelve: changes to: commit stuff
+  >>>>>>> shelve:       aef214a5229c - shelve: changes to: commit stuff
   $ cat f.orig
   g
 
@@ -937,9 +937,9 @@
   [1]
   $ cat foo
   r0
-  <<<<<<< shelve:       0b2fcf2a90e9 - shelve: pending changes temporary commit
+  <<<<<<< working-copy: 0b2fcf2a90e9 - shelve: pending changes temporary commit
   this is in wdir, conflicts with shelve
   =======
   this will be shelved
-  >>>>>>> working-copy: 9c072a2163db - shelve: changes to: r0
+  >>>>>>> shelve:       9c072a2163db - shelve: changes to: r0
   $ cd ..