Mercurial > evolve
changeset 2886:00518926094f
topic: reword and simplify explanation of "behind"
author | Aurélien Campéas |
---|---|
date | Wed, 30 Aug 2017 16:54:26 +0200 |
parents | e61a9fde2125 |
children | c1cf3c8947f1 |
files | tests/test-topic-tutorial.t |
diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic-tutorial.t Wed Aug 30 15:57:04 2017 +0200 +++ b/tests/test-topic-tutorial.t Wed Aug 30 16:54:26 2017 +0200 @@ -526,8 +526,7 @@ drinks (on branch: default, 2 changesets, 2 behind) * tools (on branch: default, 3 changesets) -The "2 behind" is telling you that there are 2 new changesets on the named -branch of the topic. You need to merge or rebase to incorporate them. +The "2 behind" is telling you that there are 2 new changesets over the base of the topic. Pushing that topic would create a new head, and therefore will be prevented: