--- a/tests/test-shelve.t Fri May 09 18:15:02 2014 -0700
+++ b/tests/test-shelve.t Thu May 08 16:55:56 2014 -0700
@@ -210,11 +210,11 @@
+++ b/a/a
@@ -1,2 +1,6 @@
a
- +<<<<<<< local: * - shelve: "pending changes temporary commit" (glob)
+ +<<<<<<< dest: * - shelve: "pending changes temporary commit" (glob)
c
+=======
+a
- +>>>>>>> other: * - shelve: "changes to '[mq]: second.patch'" (glob)
+ +>>>>>>> source: * - shelve: "changes to '[mq]: second.patch'" (glob)
diff --git a/b.rename/b b/b.rename/b
new file mode 100644
--- /dev/null
@@ -604,11 +604,11 @@
M f
? f.orig
$ cat f
- <<<<<<< local: 5f6b880e719b - shelve: "pending changes temporary commit"
+ <<<<<<< dest: 5f6b880e719b - shelve: "pending changes temporary commit"
g
=======
f
- >>>>>>> other: 23b29cada8ba - shelve: "changes to 'commit stuff'"
+ >>>>>>> source: 23b29cada8ba - shelve: "changes to 'commit stuff'"
$ cat f.orig
g
$ hg unshelve --abort
@@ -647,11 +647,11 @@
M f
? f.orig
$ cat f
- <<<<<<< local: 6b563750f973 - test: "intermediate other change"
+ <<<<<<< dest: 6b563750f973 - test: "intermediate other change"
g
=======
f
- >>>>>>> other: 23b29cada8ba - shelve: "changes to 'commit stuff'"
+ >>>>>>> source: 23b29cada8ba - shelve: "changes to 'commit stuff'"
$ cat f.orig
g
$ hg unshelve --abort