--- a/tests/test-shelve.t Fri Jan 21 13:48:18 2022 -0800
+++ b/tests/test-shelve.t Fri Jan 21 13:49:11 2022 -0800
@@ -419,11 +419,11 @@
+++ b/a/a
@@ -1,2 +1,6 @@
a
- +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit
+ +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit
c
+=======
+a
- +>>>>>>> shelve: 203c9f771d2b - shelve: changes to: [mq]: second.patch
+ +>>>>>>> shelved change: 203c9f771d2b - shelve: changes to: [mq]: second.patch
diff --git a/b/b b/b.rename/b
rename from b/b
rename to b.rename/b