# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1576008203 -3600
# Node ID cb78c6efbbdba411dc31f3ba53ec62d7a78a50ef
# Parent  a9457b9aca4eb341ea23ed682bbdf12b39c9b25c
changelog: mention the date fix for content divergence

diff -r a9457b9aca4e -r cb78c6efbbdb CHANGELOG
--- a/CHANGELOG	Tue Dec 10 20:35:56 2019 +0100
+++ b/CHANGELOG	Tue Dec 10 21:03:23 2019 +0100
@@ -14,6 +14,7 @@
   * evolve: use more often seen metavariables in command synopsis strings
   * documentation: update text and add missing figures
   * amend: cleany abort when both `--patch` and `--extract` are passed
+  * evolve: also merge the date field when solving content-divergence
 
 9.2.1 -- 2019-10-05
 -------------------