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

diff -r e41e12c576ed -r de8156fbbdcc tests/test-evolve-interrupted.t
--- a/tests/test-evolve-interrupted.t	Thu Oct 24 17:57:16 2024 +0400
+++ b/tests/test-evolve-interrupted.t	Thu Oct 24 17:57:18 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