Mercurial > evolve

diff tests/test-evolve.t @ 3993:85c99079d41f mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 21 Aug 2018 13:25:28 +0200
parents f7afd3a158e3 fb8e44c70798
children 684cc3418ecd eb4d07a0b19f
line wrap: on
line diff
--- a/tests/test-evolve.t	Fri Aug 03 00:19:45 2018 +0200
+++ b/tests/test-evolve.t	Tue Aug 21 13:25:28 2018 +0200
@@ -1543,7 +1543,7 @@
   |
   o  37:df89d30f23e2@default(draft) amended
   |
-  | *  36:59c37c5bebd1@default(draft) will cause conflict at evolve
+  | @  36:59c37c5bebd1@default(draft) will cause conflict at evolve
   | |
   | x  35:7cc12c6c7862@default(draft) will be evolved safely
   | |