Mercurial > evolve
comparison tests/test-topic.t @ 4552:0eb80259f9cb mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 20 Apr 2019 03:55:11 +0200 |
| parents | a2fdbece7ce1 7de160f6c7a9 |
| children | 79bc0f1a832e |
comparison
equal
deleted
inserted
replaced
| 4551:7de160f6c7a9 | 4552:0eb80259f9cb |
|---|---|
| 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 |