Mercurial > public > mercurial-scm > hg-stable
diff tests/test-bookflow.t @ 45923:122f0b59f5f0
errors: remove trailing "!" in messages about creating new heads on push
Differential Revision: https://phab.mercurial-scm.org/D9380
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 23 Nov 2020 12:42:57 -0800 |
| parents | d7304434390f |
| children | 65f949da8469 |
line wrap: on
line diff
--- a/tests/test-bookflow.t Mon Nov 23 12:31:53 2020 -0800 +++ b/tests/test-bookflow.t Mon Nov 23 12:42:57 2020 -0800 @@ -140,7 +140,7 @@ $ cd ../b $ # make sure we cannot push after bookmarks diverged $ hg push -B X | grep abort - abort: push creates new remote head * with bookmark 'X'! (glob) + abort: push creates new remote head * with bookmark 'X' (glob) (pull and merge or see 'hg help push' for details about pushing new heads) [1] $ hg pull -u | grep divergent