changeset 1003 | 574315ec19c2 |
parent 998 | 85ec2a55fe7c |
child 1032 | 0fcddde7dae6 |
--- a/tests/test-evolve.t Thu Jul 24 12:02:53 2014 -0700 +++ b/tests/test-evolve.t Tue Jul 29 17:15:01 2014 -0700 @@ -539,7 +539,7 @@ 7:a5bfd90a2f29 stable $ echo 3 > 1 $ hg resolve -m 1 - no more unresolved files + (no more unresolved files) $ hg graft --continue -O grafting revision 7 $ glog --hidden