Mercurial > evolve
diff tests/test-push-checkheads-multi-topics-F3.t @ 6809:9903ee44e658 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 26 Jun 2024 18:09:37 +0400 |
parents | 1328195f76a9 |
children | b1d010b2e6c4 |
line wrap: on
line diff
--- a/tests/test-push-checkheads-multi-topics-F3.t Wed Jun 26 16:24:32 2024 +0400 +++ b/tests/test-push-checkheads-multi-topics-F3.t Wed Jun 26 18:09:37 2024 +0400 @@ -94,8 +94,8 @@ $ hg push -r 'desc("C1")' pushing to $TESTTMP/E1/server searching for changes - abort: push creates new remote head 57530ca5eb24 on branch 'default//Y' + abort: push creates new remote head 57530ca5eb24 on branch 'default//Y'! (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..