changeset 596:5527e4fe4418

merge changelog update
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Tue, 23 Oct 2012 17:45:21 +0200
parents 7f89b31fcb26 (current diff) 96482166420c (diff)
children 7c40faf180bd d912a0c38182
files README
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/README
+++ b/README
@@ -46,9 +46,16 @@
 Changelog
 ==================
 
- --
+ -- 2.0.0
+
+- compat with mercurial 2.4
+
+ -- 1.1.0
 
 - fix troubles creation reporting from rebase
+- rename latecomer to bumped
+- renamed conflicting to divergent
+- smarter divergent handling
 
 1.0.2 --