Mercurial > evolve
diff tests/test-evolve-public-content-divergent-corner-cases.t @ 5637:eed42a183d46 mercurial-5.0
test-compat: merge mercurial-5.1 into mercurial-5.0
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 31 Oct 2020 19:33:42 +0800 |
| parents | e6e92835d42d 5907b495901e |
| children | 8d93e7fc0daa c2c85576ddfb |
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Sat Oct 31 19:10:55 2020 +0800 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Sat Oct 31 19:33:42 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')