Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 3108:9c9c8c1eeb93 mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge with mercurial-4.3 branch
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 18:34:22 +0200
parents a867d59ea97a 67b59d1657cf
children 50be10c63825 3e2abd40da07
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Fri Oct 20 18:34:22 2017 +0200
@@ -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
@@ -244,7 +243,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