diff -r 4a02781d90ce -r b6e50897b94e tests/test-stabilize-conflict.t --- a/tests/test-stabilize-conflict.t Thu Jun 29 23:42:29 2017 +0200 +++ b/tests/test-stabilize-conflict.t Mon Jun 26 17:20:08 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