--- a/CHANGELOG Thu Jun 14 01:39:33 2018 +0530
+++ b/CHANGELOG Thu Jun 14 02:58:30 2018 +0200
@@ -5,11 +5,15 @@
-------------------
* 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: add a new `--no-update` flag to keep working copy on the initial
- revision.
+ revision.
8.0.1 -- 2018-06-11
-------------------