Mercurial > public > mercurial-scm > hg

diff tests/test-merge6.t @ 38250:d0abd7949ea3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
phases: use "published" in the phase movement message Using "published" seems smoother than "became public" and more in line with the "phase.publishing" configuration.
author Boris Feld <boris.feld@octobus.net>
date Tue, 05 Jun 2018 02:50:25 +0200
parents 1e9c357d3ddf
children
line wrap: on
line diff
--- a/tests/test-merge6.t	Tue Jun 05 01:49:52 2018 +0200
+++ b/tests/test-merge6.t	Tue Jun 05 02:50:25 2018 +0200
@@ -42,7 +42,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets b90e70beeb58
-  1 local changesets became public
+  1 local changesets published
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved