Mercurial > hg

diff tests/test-rename-merge2.t @ 29975:c15f06109b7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: use single quotes in use warning
author timeless <timeless@mozdev.org>
date Tue, 20 Sep 2016 23:48:08 +0000
parents 978b907d9b36
children 940c05b25b07
line wrap: on
line diff
--- 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"