Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 2808:f47ed78ab17b mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 25 Jul 2017 15:17:17 +0200
parents 2280461343e5
children 13c4d518327a 67b59d1657cf
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Tue Jul 25 15:15:42 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Tue Jul 25 15:17:17 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