Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-mq-skip.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 4f8054d3171b
children e5d9441ec281
line wrap: on
line diff
--- a/tests/test-rebase-mq-skip.t	Fri Feb 08 16:28:24 2013 -0600
+++ b/tests/test-rebase-mq-skip.t	Fri Feb 08 16:27:59 2013 -0600
@@ -108,7 +108,7 @@
   $ hg up -q qtip
 
   $ HGMERGE=internal:fail hg rebase
-  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
   $ HGMERGE=internal:local hg resolve --all