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