Mercurial > evolve
changeset 4711:88c8ef4d703c
tests: update output for shorted prompts from Mercurial
This makes tests pass again after Mercurial commits 4764e8436b2a
(filemerge: make last line of prompts <40 english chars (issue6158),
2019-06-20)
CORE-TEST-OUTPUT-UPDATE: 4764e8436b2a
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Jul 2019 10:07:39 +0200 |
| parents | 0e0731406efd |
| children | e2c548cc83b5 |
| files | tests/test-evolve-public-content-divergent-corner-cases.t tests/test-prev-next.t |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Tue Jul 09 17:08:34 2019 +0800 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Thu Jul 11 10:07:39 2019 +0200 @@ -417,8 +417,8 @@ $ hg evolve --continue evolving 4:e568fd1029bb "added c e" file 'd' was deleted in other but was modified in local. - What do you want to do? - use (c)hanged version, (d)elete, or leave (u)nresolved? u + You can use (c)hanged version, (d)elete, or leave (u)nresolved. + What do you want to do? u 1 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted')
--- a/tests/test-prev-next.t Tue Jul 09 17:08:34 2019 +0800 +++ b/tests/test-prev-next.t Thu Jul 11 10:07:39 2019 +0200 @@ -470,8 +470,8 @@ [255] $ hg prev --merge --config commands.update.check=abort file 'bar' was deleted in other [destination] but was modified in local [working copy]. - What do you want to do? - use (c)hanged version, (d)elete, or leave (u)nresolved? + You can use (c)hanged version, (d)elete, or leave (u)nresolved. + What do you want to do? 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] added foo