Mercurial > evolve

changeset 5814:307a9e8489f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changelog: reorder items, spelling
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 04 Mar 2021 09:12:04 +0800
parents 741b2ae7ca4b
children 44dd0e2a28bf
files CHANGELOG
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Wed Mar 03 11:08:13 2021 +0800
+++ b/CHANGELOG	Thu Mar 04 09:12:04 2021 +0800
@@ -4,12 +4,12 @@
 10.3.0 - in progress
 --------------------
 
-  * evolve: improves content-divergence resolution that involve parent changes
+  * evolve: add a experimental.evolution.in-memory config for running evolve
+    in memory
+  * evolve: improve content-divergence resolution that involves parent changes
+  * obslog: clarify the command name in the help,
   * pdiff, pstatus: drop some irrelevant command flags inherited from `hg diff`
     and `hg status` respectively
-  * obslog: clarify the command name in the help,
-  * evolve: add a experimental.evolution.in-memory config for running evolve
-    in memory
   * rewind: detect and abort on cases when we rewind to changesets that are
     precessors / successors of each other
   * rewind: when user gives only some parts of a fold, include the other parts