Mercurial > evolve

diff tests/test-evolve-content-divergent-interrupted.t @ 6176:32faf1cd209f mercurial-6.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: back out changeset 0c052cf84944 CORE-TEST-OUTPUT-UPDATE: 38941a28406a
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 07:14:09 +0300
parents 0c052cf84944
children 9a41c3c293ae
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-interrupted.t	Tue Feb 22 07:13:41 2022 +0300
+++ b/tests/test-evolve-content-divergent-interrupted.t	Tue Feb 22 07:14:09 2022 +0300
@@ -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