changeset 964 | c768f7666106 |
parent 895 | 17ac69db9329 |
child 984 | b286f77d680c |
--- a/tests/test-stabilize-conflict.t Wed May 21 12:01:28 2014 -0700 +++ b/tests/test-stabilize-conflict.t Mon Jun 02 15:22:23 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