Mercurial > evolve
diff tests/test-stabilize-conflict.t @ 3083:e91ca8b5ecf7
obsfate: use core version of obsfate if available
Let us use the upstream version whenever available. The operation display is
currently disabled to ease with the test changes.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Oct 2017 12:04:45 +0200 |
parents | 945a0989e41b |
children | 87b83a3e0392 663dbef40f97 |
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t Thu Oct 19 18:18:43 2017 +0200 +++ b/tests/test-stabilize-conflict.t Fri Oct 20 12:04:45 2017 +0200 @@ -152,7 +152,7 @@ |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: amended as e04690b09bc6 + | obsolete: amended 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 b20d08eea373 + | obsolete: amended as 7:b20d08eea373 | summary: babar count up to ten | o changeset: 0:29ec1554cfaf