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.4
changeset 3995 684cc3418ecd
parent 3930 d00f0c369bc7
parent 3993 85c99079d41f
child 4002 21eab0a99841
child 4076 f9a850018daa 
--- 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
   | |
evolve