branch | stable |
changeset 21947 | b081decd9062 |
parent 21693 | 9c35f3a8cac4 |
child 22046 | 7a9cbb315d84 |
--- a/tests/test-merge-types.t Fri Jul 25 15:51:42 2014 -0500 +++ b/tests/test-merge-types.t Sat Jul 26 03:32:49 2014 +0200 @@ -50,7 +50,7 @@ a is a symlink: a -> symlink $ hg resolve a --tool internal:other - no more unresolved files + (no more unresolved files) $ tellmeabout a a is an executable file with content: a