--- a/tests/test-graft.t Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-graft.t Fri May 09 14:46:50 2014 -0500
@@ -220,7 +220,7 @@
$ echo b > e
$ hg resolve -m e
- no unresolved files; you may continue your unfinished operation
+ no more unresolved files
Continue with a revision should fail:
@@ -355,7 +355,7 @@
[255]
$ hg resolve --all
merging a
- no unresolved files; you may continue your unfinished operation
+ no more unresolved files
$ hg graft -c
grafting revision 1
$ hg export tip --git
@@ -384,7 +384,7 @@
[255]
$ hg resolve --all
merging a and b to b
- no unresolved files; you may continue your unfinished operation
+ no more unresolved files
$ hg graft -c
grafting revision 2
$ hg export tip --git