equal
deleted
inserted
replaced
382 $ hg ci -m 'Narf is like `zort` or `poit`!' |
382 $ hg ci -m 'Narf is like `zort` or `poit`!' |
383 $ hg merge narf |
383 $ hg merge narf |
384 merging alpha |
384 merging alpha |
385 warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark') |
385 warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark') |
386 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
386 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
387 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
387 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
388 [1] |
388 [1] |
389 $ hg revert -r narf alpha |
389 $ hg revert -r narf alpha |
390 $ hg resolve -m alpha |
390 $ hg resolve -m alpha |
391 (no more unresolved files) |
391 (no more unresolved files) |
392 $ hg topic narf |
392 $ hg topic narf |