Mercurial > evolve

changeset 5621:87ee065a688b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changelog: update for 10.1.0
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 31 Oct 2020 02:34:31 +0800
parents eb326644dc29
children fe31179e1941 4c1eb455259f
files CHANGELOG
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
 --------------------