Mercurial > evolve
comparison tests/test-topic-tutorial.t @ 4893:d3ad50b40a4e
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 | 30a544904238 |
| children | f3e39a354378 74efe8301c74 |
comparison
equal
deleted
inserted
replaced
| 4892:38079b848657 | 4893:d3ad50b40a4e |
|---|---|
| 475 $ hg update default | 475 $ hg update default |
| 476 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 476 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 477 | 477 |
| 478 $ hg merge | 478 $ hg merge |
| 479 abort: branch 'default' has one head - please merge with an explicit rev | 479 abort: branch 'default' has one head - please merge with an explicit rev |
| 480 (run 'hg heads' to see all heads) | 480 (run 'hg heads' to see all heads, specify rev with -r) |
| 481 [255] | 481 [255] |
| 482 | 482 |
| 483 But the topic will see that branch head as a valid destination: | 483 But the topic will see that branch head as a valid destination: |
| 484 | 484 |
| 485 $ hg update food | 485 $ hg update food |