Mercurial > evolve

diff tests/test-evolve-progress.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 d03f682938ae
children 9a41c3c293ae
line wrap: on
line diff
--- a/tests/test-evolve-progress.t	Tue Feb 22 07:13:41 2022 +0300
+++ b/tests/test-evolve-progress.t	Tue Feb 22 07:14:09 2022 +0300
@@ -124,11 +124,13 @@
    ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0
   starting 4 threads for background file closing (?)
    preserving a for resolve of a
-   a: versions differ -> m
+   a: versions differ -> m (premerge)
   updating: a 1/1 files (100.00%)
   picked tool ':merge' for a (binary False symlink False changedelete False)
   merging a
   my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b
+   a: versions differ -> m (merge)
+  updating: a 2/2 files (100.00%)
   picked tool ':merge' for a (binary False symlink False changedelete False)
   my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')