Mercurial > public > mercurial-scm > hg

diff tests/test-merge-revert2.t @ 21693:9c35f3a8cac4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: drop the quotes around commit description We already have a ":" after the user name to denote the start of the description. The current usage of quotes around the description is problematic as the truncation to 80 chars is likely to drop the closing quote. This may confuse syntax coloration in some editors.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 26 May 2014 11:44:58 -0700
parents 1ab30e9ba0fc
children ef1eb6df7071
line wrap: on
line diff
--- 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