--- a/README	Wed Apr 23 15:58:55 2014 -0700
+++ b/README	Sun May 11 01:29:11 2014 -0700
@@ -29,7 +29,12 @@
 ==========
 
 The simplest way to contribute is to issue a pull request on Bitbucket
-(https://bitbucket.org/marmoute/mutable-history).
+(https://bitbucket.org/marmoute/mutable-history). Please don't forget
+to update and run the tests when you fix a bug or add a feature. To
+run the tests:
+
+    cd tests
+    python run-tests.py --with-hg=/path/to/hg
 
 However, some cutting-edge changes may be found in a mutable repository hosted
 by logilab before they are published.
@@ -62,6 +67,13 @@
     - avoid exchanging common markers in some case
  - add a hook related to the new commands
 
+3.3.2 --
+
+- fix a bug where evolve were creating changeset with 2 parents on windows
+  (fix issues #16, #35 and #42)
+- adds a --obsolete flag to import (requieres Mercurial 3.0)
+- prune: update to successor rather than parent when pruning '.' with -s
+
 3.3.1 -- 2014-04-23
 
 - various language fix
@@ -72,6 +84,15 @@
 
 3.3.0 -- 2014-03-04
 
+<<<<<<< local: 1205:ec4c17e0aee6   (default)
+======= base: 1196:fc04758ea9f5 3.3.1  (stable)
+- drop `latercomer` and `conflicting` compatibility. Those old alias are
+  deprecated for a long time now.
+=======
+- raise Mercurial's minimal requirement to 2.7
+- drop `latercomer` and `conflicting` compatibility. Those old alias are
+  deprecated for a long time now.
+>>>>>>> other: 1240:32915143d448 tip @ (stable)
 - add verbose hint about how to handle corner case by hand.
   This should help people until evolve is able to to it itself.
 - removed the qsync extension. The only user I knew about (logilab) is not