branch | mercurial-4.0 |
changeset 2800 | 13c4d518327a |
parent 2701 | 26ec0839865b |
parent 2799 | 1627153804dc |
child 2801 | 49494d0155b7 |
child 3003 | ddf28837f5af |
--- a/tests/test-evolve-templates.t Tue Jul 25 03:59:22 2017 +0200 +++ b/tests/test-evolve-templates.t Tue Jul 25 04:00:17 2017 +0200 @@ -432,14 +432,12 @@ | parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: divergent | summary: A2 | | o changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: divergent | summary: A1 | | x changeset: 1:471f378eab4c