# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1709316754 10800
# Node ID ce077c3d798a720a03602684004dce226c86462b
# Parent  4018000cdb3edd43614bd240f8d01678463f54da# Parent  b699cd0ec67640cd9f601cf4609815e82629f64c
test-compat: merge mercurial-5.5 into mercurial-5.4

diff -r b699cd0ec676 -r ce077c3d798a tests/test-topic-rebase.t
--- a/tests/test-topic-rebase.t	Fri Mar 01 14:49:40 2024 -0300
+++ b/tests/test-topic-rebase.t	Fri Mar 01 15:12:34 2024 -0300
@@ -114,7 +114,7 @@
   merging file
   warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
   switching to topic myotherfeature
-  unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
+  unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
 Resolve the conflict
diff -r b699cd0ec676 -r ce077c3d798a tests/test-topic-server.t
--- a/tests/test-topic-server.t	Fri Mar 01 14:49:40 2024 -0300
+++ b/tests/test-topic-server.t	Fri Mar 01 15:12:34 2024 -0300
@@ -54,9 +54,9 @@
   
   Enabled extensions:
   
-    evolve  external  * (glob)
     rebase  internal  
     topic   external  * (glob)
+    evolve  external  * (glob)
   $ hg clone ssh://user@dummy/server client-plain
   requesting all changes
   adding changesets
@@ -81,8 +81,8 @@
   
   Enabled extensions:
   
+    rebase  internal  
     evolve  external  * (glob)
-    rebase  internal  
 
 Make two commits, with and without a topic, and push them to the server