comparison tests/test-stabilize-conflict.t @ 2701:26ec0839865b mercurial-4.0

compat: merge with mercurial-4.1
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 02 Jul 2017 17:28:15 +0200
parents 90ab79764ce4 6d48ad81e7b5
children 13c4d518327a
comparison
equal deleted inserted replaced
2700:52d5c5ce27e4 2701:26ec0839865b
143 | summary: babar count up to ten 143 | summary: babar count up to ten
144 | 144 |
145 | o changeset: 5:71c18f70c34f 145 | o changeset: 5: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 | | trouble: unstable
149 | | summary: babar count up to fifteen 148 | | summary: babar count up to fifteen
150 | | 149 | |
151 | x changeset: 4:5977072d13c5 150 | x changeset: 4:5977072d13c5
152 |/ parent: 0:29ec1554cfaf 151 |/ parent: 0:29ec1554cfaf
153 | user: test 152 | user: test
234 | summary: babar count up to ten 233 | summary: babar count up to ten
235 | 234 |
236 | o changeset: 8:1836b91c6c1d 235 | o changeset: 8:1836b91c6c1d
237 | | user: test 236 | | user: test
238 | | date: Thu Jan 01 00:00:00 1970 +0000 237 | | date: Thu Jan 01 00:00:00 1970 +0000
239 | | trouble: unstable
240 | | summary: babar count up to fifteen 238 | | summary: babar count up to fifteen
241 | | 239 | |
242 | x changeset: 7:e04690b09bc6 240 | x changeset: 7:e04690b09bc6
243 |/ parent: 0:29ec1554cfaf 241 |/ parent: 0:29ec1554cfaf
244 | user: test 242 | user: test