diff -r 3343c5491b31 -r b89108d3eca0 CHANGELOG
--- a/CHANGELOG	Tue Jun 05 03:36:40 2018 +0200
+++ b/CHANGELOG	Tue Jun 05 03:37:15 2018 +0200
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+8.1.0 - in progress
+-------------------
+
+  * evolve: handle branch changes when solving content divergence,
+
 8.0.1 -- in-progress
 ---------------------