Mercurial > evolve

diff tests/test-evolve-obshistory.t @ 2318:523855eb28c1 mercurial-4.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with future 6.1.0 In addition to the output reverted for 4.1, we also drop the "troubles:" entry from the standard log.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 03 May 2017 13:18:08 +0200
parents 7263463ae79a
children 765b2561fa90
line wrap: on
line diff
--- a/tests/test-evolve-obshistory.t	Wed May 03 13:12:39 2017 +0200
+++ b/tests/test-evolve-obshistory.t	Wed May 03 13:18:08 2017 +0200
@@ -483,14 +483,12 @@
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  trouble:     divergent
   |  summary:     A2
   |
   | o  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    trouble:     divergent
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c