Mercurial > evolve
comparison tests/test-prev-next.t @ 4195:4803bfe8db17 stable
test-compat: backed out changeset 8eec9422bd8e
Preparing the branch for 4.8.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 25 Oct 2018 12:52:34 +0200 |
| parents | 8eec9422bd8e |
| children | f555039d1a08 9e64a7d09895 |
comparison
equal
deleted
inserted
replaced
| 4192:e527df0f2a68 | 4195:4803bfe8db17 |
|---|---|
| 458 | 458 |
| 459 Testing --merge works with other values of commands.update.check also | 459 Testing --merge works with other values of commands.update.check also |
| 460 | 460 |
| 461 XXX: things are broken! | 461 XXX: things are broken! |
| 462 $ hg prev --merge --config commands.update.check=abort | 462 $ hg prev --merge --config commands.update.check=abort |
| 463 local [working copy] changed bar which other [destination] deleted | 463 file 'bar' was deleted in other [destination] but was modified in local [working copy]. |
| 464 What do you want to do? | |
| 464 use (c)hanged version, (d)elete, or leave (u)nresolved? | 465 use (c)hanged version, (d)elete, or leave (u)nresolved? |
| 465 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 466 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 466 use 'hg resolve' to retry unresolved file merges | 467 use 'hg resolve' to retry unresolved file merges |
| 467 [1] added foo | 468 [1] added foo |
| 468 | 469 |