changeset 18942:6891e361bec6

histedit: update tests for new intervention framework
author Matt Mackall <mpm@selenic.com>
date Sun, 14 Apr 2013 19:05:19 -0500
parents cb5f5859b3fd
children 27e8dfc2c338
files tests/test-histedit-edit.t
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-histedit-edit.t	Fri Mar 08 21:50:27 2013 +0100
+++ b/tests/test-histedit-edit.t	Sun Apr 14 19:05:19 2013 -0500
@@ -216,9 +216,9 @@
   $ HGEDITOR="cat \"$EDITED\" > " hg histedit 0 2>&1
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   adding a
-  abort: Make changes as needed, you may commit or record as needed now.
+  Make changes as needed, you may commit or record as needed now.
   When you are finished, run hg histedit --continue to resume.
-  [255]
+  [1]
   $ HGEDITOR=true hg histedit --continue
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-backup.hg (glob)