diff -r ee7e4e05ce44 -r 7978230faa32 CHANGELOG
--- a/CHANGELOG	Wed Apr 10 15:26:41 2019 +0200
+++ b/CHANGELOG	Wed Apr 10 15:37:29 2019 +0200
@@ -10,6 +10,8 @@
   * touch: fix error message when touching public changesets
   * evolve: make sure the extensions are only active on repository that
             enables it. Double check your server configuration (issue6057)
+  * evolve: make sure divergence resolution don't replace the initial author
+            (issue6113)
 
 8.4.0 -- 2019-12-22
 -------------------