--- a/CHANGELOG	Wed Jun 06 03:26:47 2018 +0530
+++ b/CHANGELOG	Wed Jun 06 03:49:17 2018 +0530
@@ -6,6 +6,7 @@
 
   * evolve: handle branch changes when solving content divergence,
   * evolve: add a help section dedicated to interrupted evolve,
+  * evolve: merge commit messages when resolving content divergence (issue5877)
 
 8.0.1 -- in-progress
 ---------------------