Mercurial > evolve
comparison tests/test-topic.t @ 1868:5cdd5e0a421c
test: adapt to newer mercurial
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 23 Oct 2015 13:40:44 +0100 |
| parents | c9cacc62fa17 |
| children | 995617c7f2fc |
comparison
equal
deleted
inserted
replaced
| 1867:c9cacc62fa17 | 1868:5cdd5e0a421c |
|---|---|
| 285 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 285 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 286 $ echo answer >> alpha | 286 $ echo answer >> alpha |
| 287 $ hg ci -m 'Narf is like `zort` or `poit`!' | 287 $ hg ci -m 'Narf is like `zort` or `poit`!' |
| 288 $ hg merge narf | 288 $ hg merge narf |
| 289 merging alpha | 289 merging alpha |
| 290 warning: conflicts during merge. | 290 warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark') |
| 291 merging alpha incomplete! (edit conflicts, then use 'hg resolve --mark') | |
| 292 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 291 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 293 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 292 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 294 [1] | 293 [1] |
| 295 $ hg revert -r narf alpha | 294 $ hg revert -r narf alpha |
| 296 $ hg resolve -m alpha | 295 $ hg resolve -m alpha |