# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1579535525 -25200
# Node ID 47f9ba943bb18ba4407d501b9eab22bad3198b77
# Parent  3947964a4ce7754ea0af5c056ea09e435445fcf2
changelog: add missing entries

diff -r 3947964a4ce7 -r 47f9ba943bb1 CHANGELOG
--- a/CHANGELOG	Fri Jan 03 23:12:19 2020 +0700
+++ b/CHANGELOG	Mon Jan 20 22:52:05 2020 +0700
@@ -16,6 +16,12 @@
   * 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
 -------------------