Mercurial > hg

diff tests/test-rebase-detach.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 f520c9616db5
children e7119b091809
line wrap: on
line diff
--- a/tests/test-rebase-detach.t	Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-rebase-detach.t	Wed Nov 16 18:04:19 2011 -0600
@@ -367,7 +367,7 @@
   $ hg rebase -s 8 -d 7 --detach --config ui.merge=internal:fail
   merging H
   warning: conflicts during merge.
-  merging H failed!
+  merging H incomplete! (edit conflicts, then use 'hg resolve --mark')
   abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
   $ hg resolve --all -t internal:local