merge changelog update
authorPierre-Yves David <pierre-yves.david@logilab.fr>
Tue, 23 Oct 2012 17:45:21 +0200
changeset 596 5527e4fe4418
parent 594 7f89b31fcb26 (current diff)
parent 595 96482166420c (diff)
child 602 7c40faf180bd
child 606 d912a0c38182
merge changelog update
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 --