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.
README
changeset 938 16594198b64a
parent 937 43cceb37324c
child 939 d46ef45810e4 
--- a/README	Wed May 14 16:42:41 2014 -0700
+++ b/README	Mon May 19 12:43:03 2014 -0700
@@ -86,15 +86,9 @@
 
 3.3.0 -- 2014-03-04
 
-<<<<<<< local: 1205:ec4c17e0aee6   (default)
-======= base: 1196:fc04758ea9f5 3.3.1  (stable)
-- drop `latercomer` and `conflicting` compatibility. Those old alias are
-  deprecated for a long time now.
-=======
 - raise Mercurial's minimal requirement to 2.7
 - drop `latercomer` and `conflicting` compatibility. Those old alias are
   deprecated for a long time now.
->>>>>>> other: 1240:32915143d448 tip @ (stable)
 - add verbose hint about how to handle corner case by hand.
   This should help people until evolve is able to to it itself.
 - removed the qsync extension. The only user I knew about (logilab) is not
evolve