# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1619267680 -28800
# Node ID e315f30a4877eb9fd343007f2bf21187b11613df
# Parent  7e6765cf6e5d05b2bb0d7363acfab2455604fe85# Parent  8c4b3178b32dc358a2e3f33ce5386c99613356a0
test-compat: merge mercurial-5.5 into mercurial-5.4

diff -r 7e6765cf6e5d -r e315f30a4877 tests/test-topic-rebase.t
--- a/tests/test-topic-rebase.t	Sat Apr 24 20:27:44 2021 +0800
+++ b/tests/test-topic-rebase.t	Sat Apr 24 20:34:40 2021 +0800
@@ -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 7e6765cf6e5d -r e315f30a4877 tests/test-topic-server.t
--- a/tests/test-topic-server.t	Sat Apr 24 20:27:44 2021 +0800
+++ b/tests/test-topic-server.t	Sat Apr 24 20:34:40 2021 +0800
@@ -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