Mercurial > evolve
diff tests/test-topic-fold.t @ 3914:96945ea908df stable
branching: merge default into stable
The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch
policy requires this merge. The @ bookmark is in the right location, so people
doing clone will get to the latest release.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 31 Jul 2018 12:52:06 +0200 |
parents | 1bc4b0807c37 |
children | fb4801478d5d |
line wrap: on
line diff
--- a/tests/test-topic-fold.t Wed Jul 25 15:30:37 2018 -0700 +++ b/tests/test-topic-fold.t Tue Jul 31 12:52:06 2018 +0200 @@ -40,6 +40,7 @@ marked working directory as topic: myfeature $ mkcommit feature1 active topic 'myfeature' grew its first changeset + (see 'hg help topics' for more information) $ mkcommit feature2 $ logtopic @ 2:d76a6166b18c835be9a487c5e21c7d260f0a1676 @@ -83,6 +84,7 @@ marked working directory as topic: myotherfeature $ mkcommit feature4 active topic 'myotherfeature' grew its first changeset + (see 'hg help topics' for more information) $ logtopic @ 5:5ded4d6d578c37f339b0716de2e46e12ece7cbde | topics: myotherfeature