Mercurial > evolve
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 3082:326e0ee1eed1 | 3083:e91ca8b5ecf7 |
|---|---|
| 150 | | | 150 | | |
| 151 | x changeset: 3:5977072d13c5 | 151 | x changeset: 3:5977072d13c5 |
| 152 |/ parent: 0:29ec1554cfaf | 152 |/ parent: 0:29ec1554cfaf |
| 153 | user: test | 153 | user: test |
| 154 | date: Thu Jan 01 00:00:00 1970 +0000 | 154 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 155 | obsolete: amended as e04690b09bc6 | 155 | obsolete: amended as 5:e04690b09bc6 |
| 156 | summary: babar count up to ten | 156 | summary: babar count up to ten |
| 157 | | 157 | |
| 158 o changeset: 0:29ec1554cfaf | 158 o changeset: 0:29ec1554cfaf |
| 159 user: test | 159 user: test |
| 160 date: Thu Jan 01 00:00:00 1970 +0000 | 160 date: Thu Jan 01 00:00:00 1970 +0000 |
| 242 | | | 242 | | |
| 243 | x changeset: 5:e04690b09bc6 | 243 | x changeset: 5:e04690b09bc6 |
| 244 |/ parent: 0:29ec1554cfaf | 244 |/ parent: 0:29ec1554cfaf |
| 245 | user: test | 245 | user: test |
| 246 | date: Thu Jan 01 00:00:00 1970 +0000 | 246 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 247 | obsolete: amended as b20d08eea373 | 247 | obsolete: amended as 7:b20d08eea373 |
| 248 | summary: babar count up to ten | 248 | summary: babar count up to ten |
| 249 | | 249 | |
| 250 o changeset: 0:29ec1554cfaf | 250 o changeset: 0:29ec1554cfaf |
| 251 user: test | 251 user: test |
| 252 date: Thu Jan 01 00:00:00 1970 +0000 | 252 date: Thu Jan 01 00:00:00 1970 +0000 |