Mercurial > evolve
diff tests/test-minitopic.t @ 5755:08c30eef85d3 mercurial-5.6
tests: back out changeset d0f73113fcc0
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 28 Jan 2021 18:57:49 +0800 |
parents | 73cb6cafc930 |
children | 1328195f76a9 |
line wrap: on
line diff
--- a/tests/test-minitopic.t Thu Jan 28 18:57:48 2021 +0800 +++ b/tests/test-minitopic.t Thu Jan 28 18:57:49 2021 +0800 @@ -85,13 +85,13 @@ $ hg push enabled pushing to http://localhost:$HGPORT/ searching for changes - abort: push creates new remote head 22c9514ed811 + abort: push creates new remote head 22c9514ed811! (merge or see 'hg help push' for details about pushing new heads) [255] $ hg push disabled pushing to http://localhost:$HGPORT2/ searching for changes - abort: push creates new remote head 22c9514ed811 + abort: push creates new remote head 22c9514ed811! (merge or see 'hg help push' for details about pushing new heads) [255] @@ -151,7 +151,7 @@ $ hg push disabled pushing to http://localhost:$HGPORT2/ searching for changes - abort: push creates new remote head f31af349535e + abort: push creates new remote head f31af349535e! (merge or see 'hg help push' for details about pushing new heads) [255] $ hg push enabled @@ -220,7 +220,7 @@ $ hg push enabled pushing to http://localhost:$HGPORT/ searching for changes - abort: push creates new remote head 82c5842e0472 on branch 'default:topic_A' + abort: push creates new remote head 82c5842e0472 on branch 'default:topic_A'! (merge or see 'hg help push' for details about pushing new heads) [255] $ hg push disabled