Mercurial > evolve
comparison tests/test-prev-next.t @ 4778:1340d6718a88 mercurial-5.0
test-compat: reverte output change from 4764e8436b2a (hg-5.1)
These change where applied in evolve's changeset 88c8ef4d703c.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 29 Jul 2019 13:19:54 +0200 |
| parents | ff452675566c |
| children | 5d50f3de4714 c2c85576ddfb |
comparison
equal
deleted
inserted
replaced
| 4777:ff452675566c | 4778:1340d6718a88 |
|---|---|
| 468 abort: uncommitted changes | 468 abort: uncommitted changes |
| 469 (do you want --merge?) | 469 (do you want --merge?) |
| 470 [255] | 470 [255] |
| 471 $ hg prev --merge --config commands.update.check=abort | 471 $ hg prev --merge --config commands.update.check=abort |
| 472 file 'bar' was deleted in other [destination] but was modified in local [working copy]. | 472 file 'bar' was deleted in other [destination] but was modified in local [working copy]. |
| 473 You can use (c)hanged version, (d)elete, or leave (u)nresolved. | 473 What do you want to do? |
| 474 What do you want to do? | 474 use (c)hanged version, (d)elete, or leave (u)nresolved? |
| 475 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 475 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 476 use 'hg resolve' to retry unresolved file merges | 476 use 'hg resolve' to retry unresolved file merges |
| 477 [1] added foo | 477 [1] added foo |
| 478 | 478 |
| 479 $ hg revert --all | 479 $ hg revert --all |