# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1645189545 -10800
# Node ID 0fa9cc8075aae8e8a63ff5b61becec21dadf5245
# Parent  6b619b4edbbe9f614f2514f4b9e5aa38cc27795e
changelog: update for evolve 10.5.0

diff -r 6b619b4edbbe -r 0fa9cc8075aa CHANGELOG
--- a/CHANGELOG	Fri Feb 18 16:04:23 2022 +0300
+++ b/CHANGELOG	Fri Feb 18 16:05:45 2022 +0300
@@ -4,6 +4,13 @@
 10.5.0 - in progress
 --------------------
 
+  * evolve: handle cases when working directory parent has multiple successors
+  * multiple commands: do not check for new divergence if divergence is allowed
+    via configuration
+  * fixup: a new experimental command to add working directory changes to a
+    specified revision
+  * pick: show abort message after pick is aborted for consistency
+
   * evolve, topic, pullbundle: drop compatibility with Mercurial 4.7
 
 10.4.1 -- 2021-11-19