diff CHANGELOG @ 5086:553b2f2fda93 mercurial-5.1

test-compat: merge mercurial-5.2 into mercurial-5.1

--- a/CHANGELOG	Thu Nov 28 10:48:44 2019 +0100
+++ b/CHANGELOG	Thu Jan 23 17:40:51 2020 +0700
@@ -9,10 +9,19 @@
   * 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
+  * compatibility for changes in upcoming Mercurial 5.3
+  * evolve: fix content-divergence resolution when p1 is null (issue6201)
+  * evolve: make sure divergence resolution doesn't undo changes (issue6203)
+  * evolve: preserve date when resolving content-divergence (issue6202)
+  * topic: fix a bug in logic of choosing destination for hg update
+  * topic: fix a bug in logic to choose destination when no active topic
 
 9.2.1 -- 2019-10-05
 -------------------