Mercurial > evolve
comparison tests/test-topic.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 02:47:44 +0200 |
| parents | 5ca297e78f2c f3713d41b85b |
| children | 537fd9a86c06 f9a850018daa |
comparison
equal
deleted
inserted
replaced
| 3929:e709e3817d7e | 3930:d00f0c369bc7 |
|---|---|
| 511 $ hg ci -m 'Narf is like `zort` or `poit`!' | 511 $ hg ci -m 'Narf is like `zort` or `poit`!' |
| 512 $ hg merge narf | 512 $ hg merge narf |
| 513 merging alpha | 513 merging alpha |
| 514 warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark') | 514 warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark') |
| 515 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 515 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 516 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | 516 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 517 [1] | 517 [1] |
| 518 $ hg revert -r narf alpha | 518 $ hg revert -r narf alpha |
| 519 $ hg resolve -m alpha | 519 $ hg resolve -m alpha |
| 520 (no more unresolved files) | 520 (no more unresolved files) |
| 521 $ hg topic narf | 521 $ hg topic narf |