Mercurial > evolve

diff tests/test-evolve-content-divergent-interrupted.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-content-divergent-interrupted.t	Wed Jun 26 15:19:21 2024 +0400
+++ b/tests/test-evolve-content-divergent-interrupted.t	Wed Jun 26 15:39:36 2024 +0400
@@ -383,8 +383,8 @@
   $ hg evolve -c
   evolving 8:a8673909e314 "added d"
   merging a
+  merging d
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
-  merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 2 files unresolved
   unresolved merge conflicts