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-rename-merge2.t
changeset 29975 c15f06109b7a
parent 29775 978b907d9b36
child 30062 940c05b25b07 
--- a/tests/test-rename-merge2.t	Tue Sep 20 23:47:46 2016 +0000
+++ b/tests/test-rename-merge2.t	Tue Sep 20 23:48:08 2016 +0000
@@ -719,7 +719,7 @@
   --------------
   M a
   M b
-  abort: unresolved merge conflicts (see "hg help resolve")
+  abort: unresolved merge conflicts (see 'hg help resolve')
   --------------
   
   $ tm "up a b" "nm a b" "      " "19 merge b no ancestor, prompt remove a"
@@ -764,7 +764,7 @@
   --------------
   M b
   C a
-  abort: unresolved merge conflicts (see "hg help resolve")
+  abort: unresolved merge conflicts (see 'hg help resolve')
   --------------
   
   $ tm "up a  " "um a b" "      " "20 merge a and b to b, remove a"
mercurial