tests/test-stabilize-conflict.t
branchmercurial-4.2
changeset 2798 2280461343e5
parent 2709 5d54de9cf50f
child 2800 13c4d518327a
child 3001 67b59d1657cf
--- a/tests/test-stabilize-conflict.t	Tue Jul 25 05:52:14 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Tue Jul 25 03:41:15 2017 +0200
@@ -152,7 +152,6 @@
   |/   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
@@ -244,7 +243,6 @@
   |/   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