CHANGELOG
changeset 5035 c5efcbbd0dc4
parent 5000 8d38ad9c044f
parent 5002 a3f692bcbbf4
child 5063 7eea9dc9c8c5
--- a/CHANGELOG	Sun Dec 01 12:41:20 2019 +0530
+++ b/CHANGELOG	Thu Dec 26 21:23:30 2019 +0100
@@ -18,11 +18,13 @@
   * rewind: preserve date
   * py3: fix setup.py --version
   * py3: fix documentation generation
+  * py3: fix some exception formatting
   * debian: allow to build with python 3
   * topic: add more options to command synopsis string
   * 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
 -------------------