equal
deleted
inserted
replaced
322 $ hg up -qC 3 |
322 $ hg up -qC 3 |
323 $ echo dirty >> a |
323 $ echo dirty >> a |
324 $ hg up -q 4 |
324 $ hg up -q 4 |
325 abort: conflicting changes |
325 abort: conflicting changes |
326 (commit or update --clean to discard changes) |
326 (commit or update --clean to discard changes) |
327 [255] |
327 [20] |
328 $ hg up -m 4 |
328 $ hg up -m 4 |
329 merging a |
329 merging a |
330 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
330 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
331 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
331 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
332 use 'hg resolve' to retry unresolved file merges |
332 use 'hg resolve' to retry unresolved file merges |