equal
deleted
inserted
replaced
293 |
293 |
294 File conflict is not allowed |
294 File conflict is not allowed |
295 $ hg up -qC 3 |
295 $ hg up -qC 3 |
296 $ echo dirty >> a |
296 $ echo dirty >> a |
297 $ hg up -q 4 |
297 $ hg up -q 4 |
298 abort: uncommitted changes |
298 abort: conflicting changes |
299 (commit or update --merge to allow merge) |
299 (commit or update --clean to discard changes) |
300 [255] |
300 [255] |
301 $ hg up -m 4 |
301 $ hg up -m 4 |
302 merging a |
302 merging a |
303 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
303 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
304 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
304 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |