Mercurial > evolve
diff README @ 596:5527e4fe4418
merge changelog update
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Tue, 23 Oct 2012 17:45:21 +0200 |
| parents | 96482166420c |
| children | 7c40faf180bd |
line wrap: on
line diff
--- 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 --