Mercurial > hg

diff tests/test-rebase-abort.t @ 18933:42b620fc89e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
author Augie Fackler <raf@durin42.com>
date Fri, 08 Feb 2013 16:27:59 -0600
parents b1dfca74e3d0
children e5d9441ec281
line wrap: on
line diff
--- a/tests/test-rebase-abort.t	Fri Feb 08 16:28:24 2013 -0600
+++ b/tests/test-rebase-abort.t	Fri Feb 08 16:27:59 2013 -0600
@@ -55,7 +55,7 @@
   merging common
   warning: conflicts during merge.
   merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
-  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Abort:
@@ -126,7 +126,7 @@
   merging c
   warning: conflicts during merge.
   merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
-  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
   $ hg tglog