Mercurial > evolve

diff tests/test-evolve.t @ 6068:d3453ef71ce8 mercurial-5.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.4 into mercurial-5.3 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 12:29:50 +0300
parents 664f62e57231 34f5c849fc1d
children 55e9987b8384 d76fefa7355a
line wrap: on
line diff
--- a/tests/test-evolve.t	Tue Oct 12 12:10:18 2021 +0300
+++ b/tests/test-evolve.t	Tue Oct 12 12:29:50 2021 +0300
@@ -1395,7 +1395,7 @@
   |
   o  32:6ec468e4cb98@default(draft) amended
   |
-  | %  31:5be050657ca5@default(draft) will cause conflict at evolve
+  | *  31:5be050657ca5@default(draft) will cause conflict at evolve
   | |
   | x  30:748126f98ff1@default(draft) will be evolved safely
   | |