tests/test-stabilize-conflict.t
branchstable
changeset 2797 74456bc055ae
parent 2709 5d54de9cf50f
child 2798 2280461343e5
child 2833 08a64770ed24
--- 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