diff CHANGELOG @ 3914:96945ea908df stable

branching: merge default into stable

The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch
policy requires this merge. The @ bookmark is in the right location, so people
doing clone will get to the latest release.

--- a/CHANGELOG	Wed Jul 25 15:30:37 2018 -0700
+++ b/CHANGELOG	Tue Jul 31 12:52:06 2018 +0200
@@ -1,6 +1,23 @@
 Changelog
 =========
 
+8.1.0 - in progress
+-------------------
+
+  * evolve: handle branch changes when solving content divergence,
+  * evolve: improve multiple aspect of divergence resolution
+            * branch changes handling,
+            * parent changes handling,
+            * divergent stack handling,
+  * evolve: add a help section dedicated to interrupted evolve,
+  * evolve: merge commit messages when resolving content divergence (issue5877)
+  * evolve: show unfinished state information in `hg status -v` (issue5886)
+  * evolve: move bookmarks also when updating to successors (issue5923)
+  * evolve: add a new `--no-update` flag to keep working copy on the initial
+            revision.
+  * evolve: new help section dedicated to resuming operation interrupted by
+            merge conflit, `hg help evolve.interrupted`.
+
 8.0.1 -- 2018-06-11
 -------------------