diff -r 44a6e6fbf80b -r 74456bc055ae tests/test-stabilize-conflict.t --- a/tests/test-stabilize-conflict.t Sun Jul 09 15:01:32 2017 +0300 +++ b/tests/test-stabilize-conflict.t Tue Jul 25 05:52:14 2017 +0200 @@ -152,6 +152,7 @@ |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 + | obsolete: rewritten as e04690b09bc6 | summary: babar count up to ten | o changeset: 0:29ec1554cfaf @@ -243,6 +244,7 @@ |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 + | obsolete: rewritten as b20d08eea373 | summary: babar count up to ten | o changeset: 0:29ec1554cfaf