equal
deleted
inserted
replaced
127 A a |
127 A a |
128 base |
128 base |
129 R base |
129 R base |
130 $ hg up --check dir |
130 $ hg up --check dir |
131 abort: uncommitted changes |
131 abort: uncommitted changes |
132 [255] |
132 [20] |
133 $ hg up dir |
133 $ hg up dir |
134 a: path conflict - a file or link has the same name as a directory |
134 a: path conflict - a file or link has the same name as a directory |
135 the local file has been renamed to a~d20a80d4def3 |
135 the local file has been renamed to a~d20a80d4def3 |
136 resolve manually then use 'hg resolve --mark a' |
136 resolve manually then use 'hg resolve --mark a' |
137 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
137 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
152 $ rm a/b |
152 $ rm a/b |
153 $ mkdir a/b |
153 $ mkdir a/b |
154 $ echo 9 > a/b/c |
154 $ echo 9 > a/b/c |
155 $ hg up file2 --check --config merge.checkunknown=warn |
155 $ hg up file2 --check --config merge.checkunknown=warn |
156 abort: uncommitted changes |
156 abort: uncommitted changes |
157 [255] |
157 [20] |
158 $ hg up file2 --clean |
158 $ hg up file2 --clean |
159 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
159 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
160 (activating bookmark file2) |
160 (activating bookmark file2) |