--- a/tests/test-histedit-non-commute.t Fri Apr 18 18:56:26 2014 -0700
+++ b/tests/test-histedit-non-commute.t Fri Apr 18 22:19:25 2014 -0700
@@ -154,6 +154,7 @@
fix up
$ echo 'I can haz no commute' > e
$ hg resolve --mark e
+ no unresolved files; you may continue your unfinished operation
$ hg histedit --continue 2>&1 | fixbundle
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e
@@ -167,6 +168,7 @@
just continue this time
$ hg revert -r 'p1()' e
$ hg resolve --mark e
+ no unresolved files; you may continue your unfinished operation
$ 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
@@ -239,6 +241,7 @@
$ echo 'I can haz no commute' > e
$ hg resolve --mark e
+ no unresolved files; you may continue your unfinished operation
$ hg histedit --continue 2>&1 | fixbundle
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e
@@ -248,6 +251,7 @@
second edit also fails, but just continue
$ hg revert -r 'p1()' e
$ hg resolve --mark e
+ no unresolved files; you may continue your unfinished operation
$ 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