Mercurial > evolve
comparison tests/test-topic.t @ 3430:14fbb847be5a
test: update output for new `merge --abort` message
Core have updated its command to cancel a failed merge, update the test output
to match it.
CORE-TEST-OUTPUT-UPDATE: 41ef02ba329b
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 19 Jan 2018 19:18:05 +0100 |
| parents | f7129e3d5a38 |
| children | d5adce52cef4 81985b9d3e74 |
comparison
equal
deleted
inserted
replaced
| 3429:6096acdc7d37 | 3430:14fbb847be5a |
|---|---|
| 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 |