diff -r f06c86fd2ffd -r 87b83a3e0392 tests/test-stabilize-conflict.t --- a/tests/test-stabilize-conflict.t Fri Oct 20 21:29:14 2017 +0200 +++ b/tests/test-stabilize-conflict.t Fri Oct 20 17:23:12 2017 +0200 @@ -152,7 +152,7 @@ |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: amended as 5:e04690b09bc6 + | obsolete: amended as e04690b09bc6 | summary: babar count up to ten | o changeset: 0:29ec1554cfaf @@ -244,7 +244,7 @@ |/ parent: 0:29ec1554cfaf | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: amended as 7:b20d08eea373 + | obsolete: amended as b20d08eea373 | summary: babar count up to ten | o changeset: 0:29ec1554cfaf