changeset 34553 | 0217d66846f7 |
parent 34552 | 33c8a6837181 |
child 34942 | 2a774cae3a03 |
--- a/tests/test-update-names.t Mon Oct 02 14:05:30 2017 -0700 +++ b/tests/test-update-names.t Mon Oct 02 14:05:30 2017 -0700 @@ -50,7 +50,7 @@ $ hg st ? name/file $ hg up 1 - name: untracked file differs + name: untracked directory conflicts with file abort: untracked files in working directory differ from files in requested revision [255] $ cd ..