Mercurial > hg-stable

diff tests/test-commit-unresolved.t @ 13541:919174c0aaff stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve unresolved merge conflicts warning (issue2681) Suggested by Antoine Pitrou <pitrou@free.fr>
author Patrick Mezard <pmezard@gmail.com>
date Sun, 06 Mar 2011 15:21:50 +0100
parents 92e30e135581
children 2371f4aea665
line wrap: on
line diff
--- a/tests/test-commit-unresolved.t	Fri Mar 04 19:21:12 2011 -0600
+++ b/tests/test-commit-unresolved.t	Sun Mar 06 15:21:50 2011 +0100
@@ -38,7 +38,7 @@
 
   $ echo "ABCD" > A
   $ hg commit -m "Merged"
-  abort: unresolved merge conflicts (see hg resolve)
+  abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
 Mark the conflict as resolved and commit