Mercurial > evolve
comparison tests/test-prev-next.t @ 4168:8eec9422bd8e stable
test: other harmless output change
These are new test that need adjustment for 4.7 output.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 12 Oct 2018 15:07:23 +0200 |
| parents | 73f22dc3bbbe |
| children | e268f7fd7839 ab3581bc0637 |
comparison
equal
deleted
inserted
replaced
| 4166:7091f7215651 | 4168:8eec9422bd8e |
|---|---|
| 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 file 'bar' was deleted in other [destination] but was modified in local [working copy]. | 463 local [working copy] changed bar which other [destination] deleted |
| 464 What do you want to do? | |
| 465 use (c)hanged version, (d)elete, or leave (u)nresolved? | 464 use (c)hanged version, (d)elete, or leave (u)nresolved? |
| 466 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 465 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 467 use 'hg resolve' to retry unresolved file merges | 466 use 'hg resolve' to retry unresolved file merges |
| 468 [1] added foo | 467 [1] added foo |
| 469 | 468 |