branch | mercurial-4.0 |
changeset 2701 | 26ec0839865b |
parent 2616 | feabbaa01ff0 |
parent 2700 | 52d5c5ce27e4 |
child 2702 | 167567795f6c |
child 2800 | 13c4d518327a |
--- a/tests/test-evolve-templates.t Sun Jul 02 18:22:39 2017 +0200 +++ b/tests/test-evolve-templates.t Sun Jul 02 17:28:15 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