Mercurial > hg-stable

diff tests/test-commit-unresolved.t @ 29979: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 f97bb61b51e6
children 41ef02ba329b
line wrap: on
line diff
--- a/tests/test-commit-unresolved.t	Tue Sep 20 23:47:46 2016 +0000
+++ b/tests/test-commit-unresolved.t	Tue Sep 20 23:48:08 2016 +0000
@@ -34,7 +34,7 @@
 
   $ echo "ABCD" > A
   $ hg commit -m "Merged"
-  abort: unresolved merge conflicts (see "hg help resolve")
+  abort: unresolved merge conflicts (see 'hg help resolve')
   [255]
 
 Mark the conflict as resolved and commit
@@ -56,7 +56,7 @@
   [1]
   $ hg rm --force A
   $ hg commit -m merged
-  abort: unresolved merge conflicts (see "hg help resolve")
+  abort: unresolved merge conflicts (see 'hg help resolve')
   [255]
 
   $ hg resolve -ma