Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-shelve.t
branchstable
changeset 44332 69b091cdc506
parent 43728 4330851947fb
child 44374 f5c006621f07 
--- a/tests/test-shelve.t	Thu Feb 20 17:06:01 2020 -0800
+++ b/tests/test-shelve.t	Thu Feb 20 16:21:00 2020 -0800
@@ -408,11 +408,11 @@
   +++ b/a/a
   @@ -1,2 +1,6 @@
    a
-  +<<<<<<< shelve:       2377350b6337 - shelve: pending changes temporary commit
+  +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit
    c
   +=======
   +a
-  +>>>>>>> working-copy: a68ec3400638 - shelve: changes to: [mq]: second.patch
+  +>>>>>>> shelve:       a68ec3400638 - shelve: changes to: [mq]: second.patch
   diff --git a/b/b b/b.rename/b
   rename from b/b
   rename to b.rename/b
mercurial