Mercurial > evolve
diff tests/test-stabilize-conflict.t @ 3000:bd7e8be29542 stable
branching: merge future 6.7.0 in the stable branch
We are getting ready to release a new version.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 27 Sep 2017 00:54:28 +0200 |
| parents | 06844693bb21 |
| children | 67b59d1657cf 945a0989e41b |
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t Mon Aug 21 14:21:49 2017 +0200 +++ b/tests/test-stabilize-conflict.t Wed Sep 27 00:54:28 2017 +0200 @@ -152,7 +152,7 @@ |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as e04690b09bc6 + | obsolete: amended as e04690b09bc6 | summary: babar count up to ten | o changeset: 0:29ec1554cfaf @@ -162,7 +162,7 @@ (fix the conflict and continue) - $ hg revert -r 5 --all + $ hg revert -r 71c18f70c34f --all reverting babar $ safesed 's/dix/ten/' babar $ hg resolve --all -m @@ -244,7 +244,7 @@ |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as b20d08eea373 + | obsolete: amended as b20d08eea373 | summary: babar count up to ten | o changeset: 0:29ec1554cfaf