--- a/CHANGELOG Wed Apr 10 16:59:28 2019 +0200
+++ b/CHANGELOG Wed Apr 10 16:59:58 2019 +0200
@@ -20,6 +20,9 @@
* 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)
+ * pick: align working dir branch with the one from the pick result (issue6089)
8.4.0 -- 2019-12-22
-------------------