equal
deleted
inserted
replaced
48 $ mkdir name |
48 $ mkdir name |
49 $ echo text > name/file |
49 $ echo text > name/file |
50 $ hg st |
50 $ hg st |
51 ? name/file |
51 ? name/file |
52 $ hg up 1 |
52 $ hg up 1 |
53 name: untracked file differs |
53 name: untracked directory conflicts with file |
54 abort: untracked files in working directory differ from files in requested revision |
54 abort: untracked files in working directory differ from files in requested revision |
55 [255] |
55 [255] |
56 $ cd .. |
56 $ cd .. |
57 |
57 |
58 #if symlink |
58 #if symlink |