# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1462487023 -7200
# Node ID f89c429345e9ce8a408e8c385233a61b69628db2
# Parent  093c445fd86a63d6c76848da61f10098bf3ab606# Parent  db60fb88b4b5a0b8ca02c071dc2a3583d9dd04dc
merge latest tag in 3.6-branch

diff -r 093c445fd86a -r f89c429345e9 .hgtags
--- a/.hgtags	Thu May 05 23:51:35 2016 +0200
+++ b/.hgtags	Fri May 06 00:23:43 2016 +0200
@@ -39,3 +39,4 @@
 44a9dcb3fefcf8281ebe4e359e7dbb637512cf7f 5.2.0
 c15d6168412f175568dac89e6ee1cd8434fef906 5.2.1
 bd59cc2ee2039c370a0343f683488cde2a106565 5.3.0
+b21ce82e6f7640c2b38506545968650227d67e9b 5.4.0
diff -r 093c445fd86a -r f89c429345e9 README
--- a/README	Thu May 05 23:51:35 2016 +0200
+++ b/README	Fri May 06 00:23:43 2016 +0200
@@ -56,7 +56,7 @@
 Changelog
 =========
 
-5.4.0 -- 
+5.4.0 -- 2016-05-06
 
 - Some collaboration with the topic experimental extensions,
   - hg evolve --all with consider all troubles in your current topic,
diff -r 093c445fd86a -r f89c429345e9 hgext/evolve.py
--- a/hgext/evolve.py	Thu May 05 23:51:35 2016 +0200
+++ b/hgext/evolve.py	Fri May 06 00:23:43 2016 +0200
@@ -19,8 +19,8 @@
     - improves some aspect of the early implementation in Mercurial core
 '''
 
-__version__ = '5.3.0'
-testedwith = '3.4.3 3.5.2 3.6.2 3.7'
+__version__ = '5.4.0'
+testedwith = '3.4.3 3.5.2 3.6.2 3.7.3 3.8.1'
 buglink = 'http://bz.selenic.com/'