Mercurial > evolve
diff tests/test-evolve-public-content-divergent-corner-cases.t @ 4672:653c42af172e mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 05 Jun 2019 17:42:50 +0200 |
| parents | b62ed7c69561 |
| children | 3ef4980353af 5d50f3de4714 |
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Wed Jun 05 17:39:32 2019 +0200 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Wed Jun 05 17:42:50 2019 +0200 @@ -415,8 +415,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 fix conflicts and see `hg help evolve.interrupted`