Mercurial > hg

diff tests/test-histedit-non-commute-abort.t @ 18934:93f3a06b2035

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
author Augie Fackler <raf@durin42.com>
date Fri, 08 Feb 2013 16:27:49 -0600
parents d34ba4991188
children 53060cc1b601
line wrap: on
line diff
--- a/tests/test-histedit-non-commute-abort.t	Fri Feb 08 16:27:59 2013 -0600
+++ b/tests/test-histedit-non-commute-abort.t	Fri Feb 08 16:27:49 2013 -0600
@@ -79,7 +79,7 @@
   merging e
   warning: conflicts during merge.
   merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
-  abort: Fix up the change and run hg histedit --continue
+  Fix up the change and run hg histedit --continue
 
 
 abort the edit