diff CHANGELOG @ 5623:fe31179e1941 stable

branching: merge into stable in preparation for release

--- a/CHANGELOG	Sat Oct 31 02:36:21 2020 +0800
+++ b/CHANGELOG	Sat Oct 31 17:25:32 2020 +0800
@@ -1,6 +1,27 @@
 Changelog
 =========
 
+10.1.0 - in progress
+--------------------
+
+  * 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
+  * evolve: while resolving conflicts, the evolved node will no longer be a
+    dirstate parent (won't show up in `hg parents` and not as `@` in `hg log -G`,
+    but it will show up as `%` with hg >= 5.4)
+
+topic (0.20.0)
+
+  * 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
+
 10.0.3 - in progress
 --------------------