Mercurial > evolve

diff tests/test-evolve-templates.t @ 6174:bd2c42680dff mercurial-6.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: back out changeset 5e14782908e4 CORE-TEST-OUTPUT-UPDATE: f8f2ecdde4b5 CORE-TEST-OUTPUT-UPDATE: 053a5bf508da
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 07:03:00 +0300
parents 5e14782908e4
children
line wrap: on
line diff
--- a/tests/test-evolve-templates.t	Tue Feb 22 07:01:59 2022 +0300
+++ b/tests/test-evolve-templates.t	Tue Feb 22 07:03:00 2022 +0300
@@ -1080,7 +1080,7 @@
   2 new obsolescence markers
   obsoleted 1 changesets
   new changesets 7a230b46bf61 (1 drafts)
-  (run 'hg heads' to see heads)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: 7a230b46bf61)
   $ hg log --hidden -G