diff tests/test-push-checkheads-mixed-branch-topic-G3.t @ 5892:34cd08a46b6d mercurial-5.6

test-compat: merge mercurial-5.7 into mercurial-5.6

--- a/tests/test-push-checkheads-mixed-branch-topic-G3.t	Sat Apr 24 19:54:14 2021 +0800
+++ b/tests/test-push-checkheads-mixed-branch-topic-G3.t	Sat Apr 24 20:01:39 2021 +0800
@@ -90,8 +90,8 @@
   $ hg push -r 'desc("C1")'
   pushing to $TESTTMP/E1/server
   searching for changes
-  abort: push creates new remote head dc44c53142f0
+  abort: push creates new remote head dc44c53142f0!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
   $ cd ../..