Mercurial > evolve

diff README @ 595:96482166420c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update changelog with future 1.1.0 news
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Tue, 23 Oct 2012 17:44:31 +0200
parents 31efc36f3aac
children 5527e4fe4418 d14f9c4ceaa7
line wrap: on
line diff
--- a/README	Tue Oct 23 17:32:22 2012 +0200
+++ b/README	Tue Oct 23 17:44:31 2012 +0200
@@ -46,9 +46,12 @@
 Changelog
 ==================
 
- --
+ -- 1.1.0
 
 - fix troubles creation reporting from rebase
+- rename latecomer to bumped
+- renamed conflicting to divergent
+- smarter divergent handling
 
 1.0.2 --