Mercurial > evolve
diff tests/test-evolve-public-content-divergent-corner-cases.t @ 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 | b6c819facbe8 |
| children | 1340d6718a88 1f92a6aa40d6 |
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')