Mercurial > evolve

diff tests/test-evolve-content-divergent-corner-cases.t @ 5317:011b53a9d03c mercurial-4.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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-content-divergent-corner-cases.t	Fri May 08 20:36:32 2020 +0800
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Fri May 08 22:18:15 2020 +0800
@@ -352,8 +352,7 @@
   base: [4] added e
   rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 155349b645be
   rebasing "other" content-divergent changeset de4ea3103326 on 155349b645be
-  file 'd' was deleted in local but was modified in other.
-  What do you want to do?
+  other changed d which local deleted
   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 51ee71efed61