Mercurial > evolve

diff tests/test-evolve.t @ 3983:a689f07d5663

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 21 Aug 2018 04:08:38 +0200
parents 8fcee1e65e29 fb8e44c70798
children 25981fae92f9
line wrap: on
line diff
--- a/tests/test-evolve.t	Tue Aug 21 04:05:12 2018 +0200
+++ b/tests/test-evolve.t	Tue Aug 21 04:08:38 2018 +0200
@@ -1476,7 +1476,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
   | |