# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1697305301 10800
# Node ID 8e3d4be64724fd1bc35e4340adecbd393e56bb3d
# Parent  b0dc6a03e888aeaae7808cf246d771963efa5fd9# Parent  49a18b13ce71a186b96e6987b539277265c147c3
test-compat: merge mercurial-5.5 into mercurial-5.4

diff -r b0dc6a03e888 -r 8e3d4be64724 tests/test-topic-rebase.t
--- a/tests/test-topic-rebase.t	Sat Oct 14 14:15:58 2023 -0300
+++ b/tests/test-topic-rebase.t	Sat Oct 14 14:41:41 2023 -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 b0dc6a03e888 -r 8e3d4be64724 tests/test-topic-server.t
--- a/tests/test-topic-server.t	Sat Oct 14 14:15:58 2023 -0300
+++ b/tests/test-topic-server.t	Sat Oct 14 14:41:41 2023 -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