# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1719419946 -14400
# Node ID 6ea8c0a16d83ffb7d27975f724e50584e27cd09e
# Parent  8ab491c44bb9735e9e874287f70a133e6f85033a# Parent  a4d7a0886abcb45b83a8cb93db042cad2482e386
test-compat: merge mercurial-5.5 into mercurial-5.4

diff -r 8ab491c44bb9 -r 6ea8c0a16d83 tests/test-topic-rebase.t
--- a/tests/test-topic-rebase.t	Wed Jun 26 19:51:33 2024 +0400
+++ b/tests/test-topic-rebase.t	Wed Jun 26 20:39:06 2024 +0400
@@ -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 8ab491c44bb9 -r 6ea8c0a16d83 tests/test-topic-server.t
--- a/tests/test-topic-server.t	Wed Jun 26 19:51:33 2024 +0400
+++ b/tests/test-topic-server.t	Wed Jun 26 20:39:06 2024 +0400
@@ -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