Mercurial > evolve
changeset 4904:f26ad80df723 stable
tests: add the new "-r" bit to the usual merge hint
CORE-TEST-OUTPUT-UPDATE: 8197b395710e
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 10 Oct 2019 08:22:41 +0700 |
| parents | 86b3efd4303e |
| children | f3e39a354378 33785e94097a 320c53900d4a |
| files | tests/test-topic-tutorial.t |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic-tutorial.t Wed Oct 23 01:07:58 2019 +0200 +++ b/tests/test-topic-tutorial.t Thu Oct 10 08:22:41 2019 +0700 @@ -477,7 +477,7 @@ $ hg merge abort: branch 'default' has one head - please merge with an explicit rev - (run 'hg heads' to see all heads) + (run 'hg heads' to see all heads, specify rev with -r) [255] But the topic will see that branch head as a valid destination: