diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-stabilize-conflict.t --- a/tests/test-stabilize-conflict.t Fri Oct 20 18:25:05 2017 +0200 +++ b/tests/test-stabilize-conflict.t Fri Oct 20 18:34:22 2017 +0200 @@ -152,7 +152,6 @@ |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: amended as e04690b09bc6 | summary: babar count up to ten | o changeset: 0:29ec1554cfaf @@ -244,7 +243,6 @@ |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: amended as b20d08eea373 | summary: babar count up to ten | o changeset: 0:29ec1554cfaf