Mercurial > evolve

comparison tests/test-stabilize-conflict.t @ 3930:d00f0c369bc7 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Aug 2018 02:47:44 +0200
parents 19ec729f3ca2 629558d09898
children 537fd9a86c06 684cc3418ecd
comparison
equal deleted inserted replaced
3929:e709e3817d7e 3930:d00f0c369bc7
138 | parent: 0:29ec1554cfaf 138 | parent: 0:29ec1554cfaf
139 | user: test 139 | user: test
140 | date: Thu Jan 01 00:00:00 1970 +0000 140 | date: Thu Jan 01 00:00:00 1970 +0000
141 | summary: babar count up to ten 141 | summary: babar count up to ten
142 | 142 |
143 | * changeset: 4:71c18f70c34f 143 | o changeset: 4:71c18f70c34f
144 | | user: test 144 | | user: test
145 | | date: Thu Jan 01 00:00:00 1970 +0000 145 | | date: Thu Jan 01 00:00:00 1970 +0000
146 | | instability: orphan 146 | | instability: orphan
147 | | summary: babar count up to fifteen 147 | | summary: babar count up to fifteen
148 | | 148 | |
230 | parent: 0:29ec1554cfaf 230 | parent: 0:29ec1554cfaf
231 | user: test 231 | user: test
232 | date: Thu Jan 01 00:00:00 1970 +0000 232 | date: Thu Jan 01 00:00:00 1970 +0000
233 | summary: babar count up to ten 233 | summary: babar count up to ten
234 | 234 |
235 | * changeset: 6:1836b91c6c1d 235 | o changeset: 6:1836b91c6c1d
236 | | user: test 236 | | user: test
237 | | date: Thu Jan 01 00:00:00 1970 +0000 237 | | date: Thu Jan 01 00:00:00 1970 +0000
238 | | instability: orphan 238 | | instability: orphan
239 | | summary: babar count up to fifteen 239 | | summary: babar count up to fifteen
240 | | 240 | |