Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-conflicts.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 b19b4c1df066
children 2371f4aea665
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Fri Mar 04 19:21:12 2011 -0600
+++ b/tests/test-rebase-conflicts.t	Sun Mar 06 15:21:50 2011 +0100
@@ -65,7 +65,7 @@
 Try to continue without solving the conflict:
 
   $ hg rebase --continue 
-  abort: unresolved merge conflicts (see hg resolve)
+  abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
 Conclude rebase: