# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1612010569 -28800
# Node ID 60a7ee4b6cda4372f12bb67eb658220e685b48d4
# Parent  552efcc2cc30ce1d47f1609660ebd4549cce10cf# Parent  72d88e491a199e6ab1aef9a8a7613ad5e6749a09
test-compat: merge mercurial-5.5 into mercurial-5.4

# no-check-commit

diff -r 552efcc2cc30 -r 60a7ee4b6cda tests/test-topic-rebase.t
--- a/tests/test-topic-rebase.t	Sat Jan 30 20:32:38 2021 +0800
+++ b/tests/test-topic-rebase.t	Sat Jan 30 20:42:49 2021 +0800
@@ -127,7 +127,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 552efcc2cc30 -r 60a7ee4b6cda tests/test-topic-server.t
--- a/tests/test-topic-server.t	Sat Jan 30 20:32:38 2021 +0800
+++ b/tests/test-topic-server.t	Sat Jan 30 20:42:49 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