diff tests/test-push-checkheads-partial-C2.t @ 6065:c0921b5277a0 mercurial-5.6

test-compat: merge mercurial-5.7 into mercurial-5.6 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 11:32:36 +0300
parents 08c30eef85d3 144d10e74757
children df773a9bed0c 1328195f76a9
line wrap: on
line diff
--- a/tests/test-push-checkheads-partial-C2.t	Tue Oct 12 11:15:44 2021 +0300
+++ b/tests/test-push-checkheads-partial-C2.t	Tue Oct 12 11:32:36 2021 +0300
@@ -79,8 +79,8 @@
   $ hg push --rev 'desc(A1)'
   pushing to $TESTTMP/C2/server (glob)
   searching for changes
-  abort: push creates new remote head f6082bc4ffef
+  abort: push creates new remote head f6082bc4ffef!
   (merge or see 'hg help push' for details about pushing new heads)
-  [20]
+  [255]
 
   $ cd ../..