Mercurial > evolve
diff tests/test-stabilize-conflict.t @ 3115:663dbef40f97 stable
obsfate: re-enables operation display in obsfate
Now that the compatibility checks are in a good shape we can re-enable more
noise in it.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 22:44:12 +0200 |
| parents | e91ca8b5ecf7 |
| children | 9f900937c198 ae6fddf39933 |
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t Fri Oct 20 22:31:07 2017 +0200 +++ b/tests/test-stabilize-conflict.t Fri Oct 20 22:44:12 2017 +0200 @@ -152,7 +152,7 @@ |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: amended as 5:e04690b09bc6 + | obsolete: amended using amend as 5:e04690b09bc6 | summary: babar count up to ten | o changeset: 0:29ec1554cfaf @@ -244,7 +244,7 @@ |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: amended as 7:b20d08eea373 + | obsolete: amended using amend as 7:b20d08eea373 | summary: babar count up to ten | o changeset: 0:29ec1554cfaf