tests/test-stabilize-conflict.t
branchstable
changeset 1026 35adaf02b777
parent 895 17ac69db9329
child 1032 0fcddde7dae6
--- a/tests/test-stabilize-conflict.t	Fri Jul 25 14:27:16 2014 +0200
+++ b/tests/test-stabilize-conflict.t	Fri Aug 08 10:40:47 2014 -0700
@@ -164,6 +164,7 @@
   reverting babar
   $ safesed 's/dix/ten/' babar
   $ hg resolve --all -m
+  (no more unresolved files)
   $ hg evolve --continue
   grafting revision 5
   $ hg resolve -l