# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1719399739 -14400
# Node ID 681b100496ffe34143db9f3cdab178c0d6402f83
# Parent  cf3ba1f21b1d94aafa81910d6b84a8d112ba33ff# Parent  00c5d3f9aba5c42140dc73fd35f212054a03c3f3
test-compat: merge mercurial-6.4 into mercurial-6.3

diff -r cf3ba1f21b1d -r 681b100496ff tests/test-evolve-interrupted.t
--- a/tests/test-evolve-interrupted.t	Wed Jun 26 15:02:14 2024 +0400
+++ b/tests/test-evolve-interrupted.t	Wed Jun 26 15:02:19 2024 +0400
@@ -45,6 +45,8 @@
   $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other
   move:[1] banana
   atop:[2] apricot and blueberry
+  transaction abort!
+  rollback completed
   abort: precommit hook exited with status 1
   [40]
   $ hg l
@@ -102,6 +104,8 @@
   $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other
   move:[1] banana
   atop:[2] apricot and blueberry
+  transaction abort!
+  rollback completed
   abort: precommit hook exited with status 1
   [40]
   $ cat b
@@ -125,6 +129,8 @@
   $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other
   move:[1] banana
   atop:[2] apricot and blueberry
+  transaction abort!
+  rollback completed
   abort: precommit hook exited with status 1
   [40]
   $ hg evolve --continue