Mercurial > evolve

diff tests/test-sharing.t @ 3431:2e703ed1c713

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: update output for wider reporting of troubled changesets CORE-TEST-OUTPUT-UPDATE: 1a09dad8b85a
author Martin von Zweigbergk <martinvonz@google.com>
date Sat, 13 Jan 2018 14:35:49 -0800
parents d3a17c67f85c
children d5adce52cef4 ec460882eab7
line wrap: on
line diff
--- a/tests/test-sharing.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-sharing.t	Sat Jan 13 14:35:49 2018 -0800
@@ -485,9 +485,9 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
+  2 new content-divergent changesets
   new changesets e3f99ce9d9cd
   (run 'hg heads' to see heads, 'hg merge' to merge)
-  2 new content-divergent changesets
 
 Figure SG09: multiple heads! divergence! oh my!
   $ hg --hidden shortlog -G -r 3::