# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1604082871 -28800
# Node ID 87ee065a688be1e3d40336572ca6d5273927757c
# Parent  eb326644dc296371b85fdf9f7d2418ef293df223
changelog: update for 10.1.0

diff -r eb326644dc29 -r 87ee065a688b CHANGELOG
--- a/CHANGELOG	Wed Oct 28 20:24:26 2020 +0100
+++ b/CHANGELOG	Sat Oct 31 02:34:31 2020 +0800
@@ -4,8 +4,11 @@
 10.1.0 - in progress
 --------------------
 
-  * numerous minor changes to packaging, README moved to README.rst
+  * compatibility with Mercurial 5.6
+
+  * numerous minor changes to packaging, Makefile, README moved to README.rst
   * metaedit: update bookmark location when applicable
+  * evolve: various improvements to content-divergence resolution
   * evolve: fix various issues with --continue when solving content-divergence
   * rewind: add a --dry-run flag
   * rewind: properly record rewind of splits as folds
@@ -17,7 +20,7 @@
 
   * stack: support foo#stack relation revset (hg-5.4+ only)
   * merge: add a experimental.topic.linear-merge option to allow oedipus merges
-           in some cases.
+    in some cases
 
 10.0.3 - in progress
 --------------------