diff -r 93c6a274cd83 -r e7b44e9c38d2 CHANGELOG
--- a/CHANGELOG	Thu Apr 18 23:51:13 2019 +0200
+++ b/CHANGELOG	Fri Apr 19 10:31:53 2019 +0530
@@ -4,8 +4,9 @@
 8.5.1 - in progress
 -------------------
 
-  * topic: compatibility with mercurial-5.0
-  * topic: improve extensions isolation (issue6121)
+  * evolve: make sure we use upstream merge code with 5.0,
+  * topic: compatibility with mercurial-5.0,
+  * topic: improve extensions isolation (issue6121).
 
 8.5.0 -- 2019-04-23
 -------------------