Mercurial > evolve

diff tests/test-stabilize-result.t @ 947:9a6cc7e6f0dd stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: improve wording of a few of messages
author Angel Ezquerra <angel.ezquerra@gmail.com>
date Tue, 29 Apr 2014 22:25:35 +0200
parents 561b3cdb4453
children cf4dcf49d998
line wrap: on
line diff
--- a/tests/test-stabilize-result.t	Tue Apr 29 22:25:21 2014 +0200
+++ b/tests/test-stabilize-result.t	Tue Apr 29 22:25:35 2014 +0200
@@ -319,7 +319,7 @@
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
-  abort: Merge conflict between several amendments, and this is not yet automated
+  abort: merge conflict between several amendments (this is not automated yet)
   (/!\ You can try:
   /!\ * manual merge + resolve => new cset X
   /!\ * hg up to the parent of the amended changeset (which are named W and Z)