Mercurial > public > mercurial-scm > hg-stable

diff tests/test-commit-unresolved.t @ 23917:3cbb5bf4035d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
messages: quote "hg help" hints consistently
author Wagner Bruna <wbruna@yahoo.com>
date Sat, 17 Jan 2015 22:01:14 -0200
parents b081decd9062
children ef1eb6df7071
line wrap: on
line diff
--- a/tests/test-commit-unresolved.t	Sat Jan 17 18:08:47 2015 -0800
+++ b/tests/test-commit-unresolved.t	Sat Jan 17 22:01:14 2015 -0200
@@ -35,7 +35,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