# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1645503221 -10800
# Node ID d03f682938ae2d195e00b765a37ea8b460bc7496
# Parent  bd2c42680dffbb2ec3d87e2163aa2125cea93fa1
test-compat: back out changeset cb5e056048d0

CORE-TEST-OUTPUT-UPDATE: 6b1049d71c3e

diff -r bd2c42680dff -r d03f682938ae tests/test-evolve-progress.t
--- a/tests/test-evolve-progress.t	Tue Feb 22 07:03:00 2022 +0300
+++ b/tests/test-evolve-progress.t	Tue Feb 22 07:13:41 2022 +0300
@@ -129,6 +129,8 @@
   picked tool ':merge' for a (binary False symlink False changedelete False)
   merging a
   my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b
+  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')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')