changeset 1003 | 574315ec19c2 |
parent 986 | c1f8ece4182d |
child 1032 | 0fcddde7dae6 |
--- a/tests/test-stabilize-conflict.t Thu Jul 24 12:02:53 2014 -0700 +++ b/tests/test-stabilize-conflict.t Tue Jul 29 17:15:01 2014 -0700 @@ -164,7 +164,7 @@ reverting babar $ safesed 's/dix/ten/' babar $ hg resolve --all -m - no more unresolved files + (no more unresolved files) $ hg evolve --continue grafting revision 5 $ hg resolve -l