tests/test-graft.t
branchstable
changeset 21947 b081decd9062
parent 21765 44255f7ce886
child 21979 c2863cfe8a8a
child 22302 9472284df4eb
--- a/tests/test-graft.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-graft.t	Sat Jul 26 03:32:49 2014 +0200
@@ -235,7 +235,7 @@
 
   $ echo b > e
   $ hg resolve -m e
-  no more unresolved files
+  (no more unresolved files)
 
 Continue with a revision should fail:
 
@@ -370,7 +370,7 @@
   [255]
   $ hg resolve --all
   merging a
-  no more unresolved files
+  (no more unresolved files)
   $ hg graft -c
   grafting revision 1
   $ hg export tip --git
@@ -399,7 +399,7 @@
   [255]
   $ hg resolve --all
   merging a and b to b
-  no more unresolved files
+  (no more unresolved files)
   $ hg graft -c
   grafting revision 2
   $ hg export tip --git