Mercurial > evolve
comparison tests/test-evolve-obshistory.t @ 3110:50be10c63825 mercurial-4.0
test-compat: merge with mercurial-4.1 branch
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Oct 2017 18:43:55 +0200 |
parents | 3024ae293732 ddf28837f5af |
children | 088ea9b74e47 |
comparison
equal
deleted
inserted
replaced
3109:3024ae293732 | 3110:50be10c63825 |
---|---|
1013 @ changeset: 3:65b757b745b9 | 1013 @ changeset: 3:65b757b745b9 |
1014 | tag: tip | 1014 | tag: tip |
1015 | parent: 0:ea207398892e | 1015 | parent: 0:ea207398892e |
1016 | user: test | 1016 | user: test |
1017 | date: Thu Jan 01 00:00:00 1970 +0000 | 1017 | date: Thu Jan 01 00:00:00 1970 +0000 |
1018 | trouble: divergent | |
1019 | summary: A2 | 1018 | summary: A2 |
1020 | | 1019 | |
1021 | o changeset: 2:fdf9bde5129a | 1020 | o changeset: 2:fdf9bde5129a |
1022 |/ parent: 0:ea207398892e | 1021 |/ parent: 0:ea207398892e |
1023 | user: test | 1022 | user: test |
1024 | date: Thu Jan 01 00:00:00 1970 +0000 | 1023 | date: Thu Jan 01 00:00:00 1970 +0000 |
1025 | trouble: divergent | |
1026 | summary: A1 | 1024 | summary: A1 |
1027 | | 1025 | |
1028 | x changeset: 1:471f378eab4c | 1026 | x changeset: 1:471f378eab4c |
1029 |/ user: test | 1027 |/ user: test |
1030 | date: Thu Jan 01 00:00:00 1970 +0000 | 1028 | date: Thu Jan 01 00:00:00 1970 +0000 |