# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1528237157 -19800
# Node ID 1de50022e888216d38803bd29ba9372b06f1133f
# Parent  4bad80f1aad37dfa9008e2ff9886e340bea4336b
CHANGELOG: add an entry about fixing issue5877

diff -r 4bad80f1aad3 -r 1de50022e888 CHANGELOG
--- 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
 ---------------------