Mercurial > evolve

comparison tests/test-stabilize-conflict.t @ 3411:e1f3e43a50a4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: backed out test output changes from core-1905aac253f0 This backs out evolve-ae6fddf39933
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 15 Jan 2018 19:52:00 +0100
parents 823031b51d81
children d3a17c67f85c 85cdce113c2c
comparison
equal deleted inserted replaced
3410:39112fd4d5ed 3411:e1f3e43a50a4
140 | parent: 0:29ec1554cfaf 140 | parent: 0:29ec1554cfaf
141 | user: test 141 | user: test
142 | date: Thu Jan 01 00:00:00 1970 +0000 142 | date: Thu Jan 01 00:00:00 1970 +0000
143 | summary: babar count up to ten 143 | summary: babar count up to ten
144 | 144 |
145 | * changeset: 4:71c18f70c34f 145 | o changeset: 4:71c18f70c34f
146 | | user: test 146 | | user: test
147 | | date: Thu Jan 01 00:00:00 1970 +0000 147 | | date: Thu Jan 01 00:00:00 1970 +0000
148 | | instability: orphan 148 | | instability: orphan
149 | | summary: babar count up to fifteen 149 | | summary: babar count up to fifteen
150 | | 150 | |
232 | parent: 0:29ec1554cfaf 232 | parent: 0:29ec1554cfaf
233 | user: test 233 | user: test
234 | date: Thu Jan 01 00:00:00 1970 +0000 234 | date: Thu Jan 01 00:00:00 1970 +0000
235 | summary: babar count up to ten 235 | summary: babar count up to ten
236 | 236 |
237 | * changeset: 6:1836b91c6c1d 237 | o changeset: 6:1836b91c6c1d
238 | | user: test 238 | | user: test
239 | | date: Thu Jan 01 00:00:00 1970 +0000 239 | | date: Thu Jan 01 00:00:00 1970 +0000
240 | | instability: orphan 240 | | instability: orphan
241 | | summary: babar count up to fifteen 241 | | summary: babar count up to fifteen
242 | | 242 | |