equal
deleted
inserted
replaced
518 $ hg ci -m 'Narf is like `zort` or `poit`!' |
518 $ hg ci -m 'Narf is like `zort` or `poit`!' |
519 $ hg merge narf |
519 $ hg merge narf |
520 merging alpha |
520 merging alpha |
521 warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark') |
521 warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark') |
522 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
522 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
523 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
523 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
524 [1] |
524 [1] |
525 $ hg revert -r narf alpha |
525 $ hg revert -r narf alpha |
526 $ hg resolve -m alpha |
526 $ hg resolve -m alpha |
527 (no more unresolved files) |
527 (no more unresolved files) |
528 $ hg topic narf |
528 $ hg topic narf |