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-merge-revert2.t
changeset 21693 9c35f3a8cac4
parent 21537 1ab30e9ba0fc
child 26614 ef1eb6df7071 
--- a/tests/test-merge-revert2.t	Thu Aug 15 15:47:15 2013 -0500
+++ b/tests/test-merge-revert2.t	Mon May 26 11:44:58 2014 -0700
@@ -57,11 +57,11 @@
   @@ -1,3 +1,7 @@
    added file1
    another line of text
-  +<<<<<<< working copy: c3fa057dd86f  - test: "added file1 and file2"
+  +<<<<<<< working copy: c3fa057dd86f  - test: added file1 and file2
   +changed file1 different
   +=======
    changed file1
-  +>>>>>>> destination:  dfab7f3c2efb - test: "changed file1"
+  +>>>>>>> destination:  dfab7f3c2efb - test: changed file1
 
   $ hg status
   M file1
mercurial