equal
deleted
inserted
replaced
51 $ mkdir a |
51 $ mkdir a |
52 $ echo 3 > a/b |
52 $ echo 3 > a/b |
53 $ hg up file |
53 $ hg up file |
54 a: untracked directory conflicts with file |
54 a: untracked directory conflicts with file |
55 abort: untracked files in working directory differ from files in requested revision |
55 abort: untracked files in working directory differ from files in requested revision |
56 [255] |
56 [20] |
57 $ hg up --clean file |
57 $ hg up --clean file |
58 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
58 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
59 (activating bookmark file) |
59 (activating bookmark file) |
60 |
60 |
61 Repo state is ok |
61 Repo state is ok |