Mercurial > evolve

diff tests/test-evolve.t @ 3995:684cc3418ecd mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 21 Aug 2018 13:26:35 +0200
parents d00f0c369bc7 85c99079d41f
children 21eab0a99841 f9a850018daa
line wrap: on
line diff
--- a/tests/test-evolve.t	Fri Aug 03 00:19:47 2018 +0200
+++ b/tests/test-evolve.t	Tue Aug 21 13:26:35 2018 +0200
@@ -1539,7 +1539,7 @@
   |
   o  37:df89d30f23e2@default(draft) amended
   |
-  | o  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
   | |