--- a/tests/test-histedit-fold-non-commute.t Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-histedit-fold-non-commute.t Fri May 09 14:46:50 2014 -0500
@@ -95,7 +95,7 @@
fix up
$ echo 'I can haz no commute' > e
$ hg resolve --mark e
- no unresolved files; you may continue your unfinished operation
+ no more unresolved files
$ cat > cat.py <<EOF
> import sys
> print open(sys.argv[1]).read()
@@ -130,7 +130,7 @@
just continue this time
$ hg revert -r 'p1()' e
$ hg resolve --mark e
- no unresolved files; you may continue your unfinished operation
+ no more unresolved files
$ hg histedit --continue 2>&1 | fixbundle
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved