branch | mercurial-4.0 |
changeset 2432 | 765b2561fa90 |
parent 2318 | 523855eb28c1 |
parent 2431 | 0405bbda7402 |
child 2532 | ca157d06b2dc |
--- a/tests/test-evolve-obshistory.t Thu May 18 23:12:52 2017 +0200 +++ b/tests/test-evolve-obshistory.t Thu May 18 23:35:16 2017 +0200 @@ -792,14 +792,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