diff tests/test-evolve-phase-divergence.t @ 3715:a77fb9669e99 mercurial-4.3

test-compat: merge mercurial-4.4 into mercurial-4.3

--- a/tests/test-evolve-phase-divergence.t	Mon Apr 23 12:11:10 2018 +0200
+++ b/tests/test-evolve-phase-divergence.t	Mon Apr 23 12:23:00 2018 +0200
@@ -80,7 +80,6 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets 4d1169d82e47
   (run 'hg update' to get a working copy)
 
   $ hg glog
@@ -562,7 +561,7 @@
   pulling from ../public
   searching for changes
   no changes found
-  1 new phase-divergent changesets
+  1 new bumped changesets
 
   $ hg obslog -r .
   @  334e300d6db5 (10) added x to x
@@ -1213,7 +1212,7 @@
   1 changesets pruned
 
   $ hg phase 12ebe0d625d7 --hidden --public
-  1 new phase-divergent changesets
+  1 new bumped changesets
 
 Resolution of phase-divergent merge commit using `hg evolve`