diff tests/test-merge6.t @ 38249:1e9c357d3ddf

phase: clarify the message about movement on command changeset The current message is a bit generic. Since we only print it for phase movement on changeset already common before the pull, we add "local" to the message in and attempt to clarify what changeset the phase movement affected.
author Boris Feld <boris.feld@octobus.net>
date Tue, 05 Jun 2018 01:49:52 +0200
parents eb9835014d20
children d0abd7949ea3
line wrap: on
line diff
--- a/tests/test-merge6.t	Sun Apr 29 00:29:40 2018 -0400
+++ b/tests/test-merge6.t	Tue Jun 05 01:49:52 2018 +0200
@@ -42,7 +42,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   new changesets b90e70beeb58
-  1 changesets became public
+  1 local changesets became public
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved