Mercurial > evolve
diff tests/test-push-checkheads-unpushed-D4.t @ 5892:34cd08a46b6d mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 24 Apr 2021 20:01:39 +0800 |
parents | 08c30eef85d3 |
children | 669270305ccb c0921b5277a0 |
line wrap: on
line diff
--- a/tests/test-push-checkheads-unpushed-D4.t Sat Apr 24 19:54:14 2021 +0800 +++ b/tests/test-push-checkheads-unpushed-D4.t Sat Apr 24 20:01:39 2021 +0800 @@ -109,9 +109,9 @@ $ hg push --rev 'desc(A1)' pushing to $TESTTMP/D4/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] Actual testing (existing branch only) ------------------------------------