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
branchmercurial-4.6
changeset 3993 85c99079d41f
parent 3909 f7afd3a158e3
parent 3978 fb8e44c70798
child 3995 684cc3418ecd
child 4074 eb4d07a0b19f 
--- 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
   | |
evolve