Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve.t
changeset 3983 a689f07d5663
parent 3946 8fcee1e65e29
parent 3978 fb8e44c70798
child 4049 25981fae92f9 
--- 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
   | |
evolve