changeset 34553 | 0217d66846f7 |
parent 34552 | 33c8a6837181 |
child 34555 | 989e884d1be9 |
--- a/tests/test-pathconflicts-basic.t Mon Oct 02 14:05:30 2017 -0700 +++ b/tests/test-pathconflicts-basic.t Mon Oct 02 14:05:30 2017 -0700 @@ -37,7 +37,7 @@ $ mkdir a $ echo 3 > a/b $ hg up file - a: untracked file differs + a: untracked directory conflicts with file abort: untracked files in working directory differ from files in requested revision [255] $ hg up --clean file