Mercurial > hg-stable

diff tests/test-rebase-detach.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 1ef89df2c248
children e5d9441ec281
line wrap: on
line diff
--- a/tests/test-rebase-detach.t	Fri Feb 08 16:28:24 2013 -0600
+++ b/tests/test-rebase-detach.t	Fri Feb 08 16:27:59 2013 -0600
@@ -372,7 +372,7 @@
   merging H
   warning: conflicts during merge.
   merging H 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 resolve --all -t internal:local
   $ hg rebase -c