# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1359804010 -3600
# Node ID 40854e956315401593b88492ebe532876bb25198
# Parent  f727ebe6ffd5ec4427c8e4229dadfeca0268b1ba# Parent  e6e47c432ffd7cfbec22bdd57925e82a84d2ce08
merge

diff -r e6e47c432ffd -r 40854e956315 README
--- a/README	Fri Jan 25 17:26:47 2013 +0100
+++ b/README	Sat Feb 02 12:20:10 2013 +0100
@@ -11,9 +11,7 @@
 It also:
 
     - enables the "Changeset Obsolescence" feature of mercurial,
-    - alters core commands and extensions that rewrite history to use
-      this feature,
-    - improves some aspect of the early implementation in 2.3
+    - issues several warning messages when troubles appear in your repository.
 
 **These extensions are experimental and are not meant for production.**
 
@@ -46,6 +44,10 @@
 Changelog
 ==================
 
+3.0.0 --
+
+- compatibility with 2.5
+
 2.2.0 --
 
 - make evolve smarter at picking next troubled to solved without --any
diff -r e6e47c432ffd -r 40854e956315 docs/evolve-faq.rst
--- a/docs/evolve-faq.rst	Fri Jan 25 17:26:47 2013 +0100
+++ b/docs/evolve-faq.rst	Sat Feb 02 12:20:10 2013 +0100
@@ -133,7 +133,7 @@
 
 For more complexe scenario we recommend the use of the histedit_ extension.
 
-.. _histedit:: http://mercurial.selenic.com/wiki/HisteditExtension
+.. _histedit: http://mercurial.selenic.com/wiki/HisteditExtension
 
 
 Update my current work in progress after a pull