# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1351007121 -7200
# Node ID 5527e4fe4418189e9b65e3a36413d08cd3d42d1f
# Parent  7f89b31fcb268694bea8f7b14966dc22fdd01153# Parent  96482166420c413e5a912ede29a1958b18ee1d54
merge changelog update

diff -r 7f89b31fcb26 -r 5527e4fe4418 README
--- a/README	Tue Oct 23 17:43:22 2012 +0200
+++ b/README	Tue Oct 23 17:45:21 2012 +0200
@@ -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 --