Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-conflicts.t @ 15501:2371f4aea665

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: give a special message for internal:merge failure (issue3105)
author Matt Mackall <mpm@selenic.com>
date Wed, 16 Nov 2011 18:04:19 -0600
parents 919174c0aaff
children 65df60a3f96b
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-rebase-conflicts.t	Wed Nov 16 18:04:19 2011 -0600
@@ -58,7 +58,7 @@
   $ hg rebase -s 3 -d 2
   merging common
   warning: conflicts during merge.
-  merging common failed!
+  merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
   abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]