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