Mercurial > evolve

diff tests/test-evolve-public-content-divergent-corner-cases.t @ 6805:e51dfd0e1a88 mercurial-6.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-6.1 into mercurial-6.0
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 26 Jun 2024 15:39:36 +0400
parents 9a41c3c293ae
children 1328195f76a9
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Wed Jun 26 15:19:21 2024 +0400
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Wed Jun 26 15:39:36 2024 +0400
@@ -421,7 +421,7 @@
 
   $ hg evolve --continue
   evolving 4:e568fd1029bb "added c e"
-  file 'd' was deleted in other [other] but was modified in local [local].
+  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
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved