Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-check-restore.t @ 12896:b19b4c1df066 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: improve resolve failure message
author Steve Borho <steve@borho.org>
date Sat, 30 Oct 2010 16:58:15 -0500
parents 6cc4b14fb76b
children 2371f4aea665 41885892796e
line wrap: on
line diff
--- a/tests/test-rebase-check-restore.t	Mon Nov 01 10:24:07 2010 +0100
+++ b/tests/test-rebase-check-restore.t	Sat Oct 30 16:58:15 2010 -0500
@@ -64,7 +64,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Solve the conflict and go on:
@@ -116,7 +116,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Solve the conflict and go on: