diff -r 98941c28f3e2 -r 7a5c3175015e tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Wed Mar 21 16:18:31 2018 +0100
+++ b/tests/test-stabilize-conflict.t	Wed Mar 21 16:32:54 2018 +0100
@@ -65,8 +65,8 @@
   $ safesed 's/huit/eight/' babar
   $ hg diff
   diff -r 9d5daf8bd956 babar
-  --- a/babar	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/babar	Thu Jan 01 00:00:00 1970 +0000
+  --- a/babar	* (glob)
+  +++ b/babar	* (glob)
   @@ -5,6 +5,6 @@
    cinq
    six
@@ -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
@@ -246,7 +245,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