Mercurial > evolve
diff tests/test-evolve-content-divergent-corner-cases.t @ 6187:df8df57a3ce3 mercurial-5.0
test-compat: merge mercurial-5.1 into mercurial-5.0
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 22 Feb 2022 18:21:24 +0300 |
| parents | 67fc03f42d92 |
| children | be8f7eb3f3a0 716912541759 |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-corner-cases.t Tue Feb 22 18:14:26 2022 +0300 +++ b/tests/test-evolve-content-divergent-corner-cases.t Tue Feb 22 18:21:24 2022 +0300 @@ -376,8 +376,8 @@ base: [4] added e rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 5f6d8a4bf34a file 'd' was deleted in local but was modified in other. - You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. - What do you want to do? c + What do you want to do? + use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c 0 files updated, 1 files merged, 0 files removed, 0 files unresolved working directory is now at 050a5d9ba60d