Mercurial > evolve
diff tests/test-evolve-public-content-divergent-corner-cases.t @ 5314:e6e92835d42d mercurial-5.0
test-compat: merge mercurial-5.1 into mercurial-5.0
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 08 May 2020 20:36:29 +0800 |
| parents | e5fe3ca5e6ad 30a924abda75 |
| children | 011b53a9d03c eed42a183d46 |
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Fri May 08 20:36:28 2020 +0800 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Fri May 08 20:36:29 2020 +0800 @@ -422,8 +422,8 @@ $ hg evolve --continue evolving 4:e568fd1029bb "added c e" file 'd' was deleted in other but was modified in local. - You can use (c)hanged version, (d)elete, or leave (u)nresolved. - What do you want to do? u + What do you want to do? + use (c)hanged version, (d)elete, or leave (u)nresolved? u 1 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted')