--- a/tests/test-shelve.t	Thu Aug 15 15:47:15 2013 -0500
+++ b/tests/test-shelve.t	Mon May 26 11:44:58 2014 -0700
@@ -210,11 +210,11 @@
   +++ b/a/a
   @@ -1,2 +1,6 @@
    a
-  +<<<<<<< dest: *  - shelve: "pending changes temporary commit" (glob)
+  +<<<<<<< dest:   *  - shelve: pending changes temporary commit (glob)
    c
   +=======
   +a
-  +>>>>>>> source: * - shelve: "changes to '[mq]: second.patch'" (glob)
+  +>>>>>>> source: 4702e8911fe0 - shelve: changes to '[mq]: second.patch'
   diff --git a/b.rename/b b/b.rename/b
   new file mode 100644
   --- /dev/null
@@ -602,11 +602,11 @@
   M f
   ? f.orig
   $ cat f
-  <<<<<<< dest:   5f6b880e719b  - shelve: "pending changes temporary commit"
+  <<<<<<< dest:   5f6b880e719b  - shelve: pending changes temporary commit
   g
   =======
   f
-  >>>>>>> source: 23b29cada8ba - shelve: "changes to 'commit stuff'"
+  >>>>>>> source: 23b29cada8ba - shelve: changes to 'commit stuff'
   $ cat f.orig
   g
   $ hg unshelve --abort
@@ -645,11 +645,11 @@
   M f
   ? f.orig
   $ cat f
-  <<<<<<< dest:   6b563750f973  - test: "intermediate other change"
+  <<<<<<< dest:   *  - test: intermediate other change (glob)
   g
   =======
   f
-  >>>>>>> source: 23b29cada8ba - shelve: "changes to 'commit stuff'"
+  >>>>>>> source: 23b29cada8ba - shelve: changes to 'commit stuff'
   $ cat f.orig
   g
   $ hg unshelve --abort