changeset 21267 | e4f451c8c05c |
parent 21266 | 19d6fec60b81 |
child 21391 | cb15835456cb |
--- a/tests/test-merge-types.t Fri Apr 18 22:19:25 2014 -0700 +++ b/tests/test-merge-types.t Fri May 09 14:46:50 2014 -0500 @@ -50,7 +50,7 @@ a is a symlink: a -> symlink $ hg resolve a --tool internal:other - no unresolved files; you may continue your unfinished operation + no more unresolved files $ tellmeabout a a is an executable file with content: a