Mercurial > evolve
diff tests/test-evolve-public-content-divergent-corner-cases.t @ 5317:011b53a9d03c mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 08 May 2020 22:18:15 +0800 |
| parents | a7fb433faab6 e6e92835d42d |
| children | 88f9bbba392d 8d93e7fc0daa |
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Fri May 08 20:36:32 2020 +0800 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Fri May 08 22:18:15 2020 +0800 @@ -421,8 +421,7 @@ $ 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? + local changed d which other deleted 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