equal
deleted
inserted
replaced
208 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
208 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
209 use 'hg resolve' to retry unresolved file merges |
209 use 'hg resolve' to retry unresolved file merges |
210 [1] |
210 [1] |
211 $ hg up 0 |
211 $ hg up 0 |
212 abort: outstanding merge conflicts |
212 abort: outstanding merge conflicts |
|
213 (use 'hg resolve' to resolve) |
213 [255] |
214 [255] |
214 $ hg merge 2 |
215 $ hg merge 2 |
215 abort: outstanding merge conflicts |
216 abort: outstanding merge conflicts |
|
217 (use 'hg resolve' to resolve) |
216 [255] |
218 [255] |
217 $ hg merge --force 2 |
219 $ hg merge --force 2 |
218 abort: outstanding merge conflicts |
220 abort: outstanding merge conflicts |
|
221 (use 'hg resolve' to resolve) |
219 [255] |
222 [255] |
220 |
223 |
221 set up conflict-free merge |
224 set up conflict-free merge |
222 |
225 |
223 $ hg up -qC 3 |
226 $ hg up -qC 3 |