# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1614820361 -28800
# Node ID 44dd0e2a28bf27e39e15b34138a4b20e19855c21
# Parent  307a9e8489f29d6d10261c4e63ab9ccbb8bcec94
changelog: move a recently added feature to the correct release

diff -r 307a9e8489f2 -r 44dd0e2a28bf CHANGELOG
--- a/CHANGELOG	Thu Mar 04 09:12:04 2021 +0800
+++ b/CHANGELOG	Thu Mar 04 09:12:41 2021 +0800
@@ -7,6 +7,7 @@
   * evolve: add a experimental.evolution.in-memory config for running evolve
     in memory
   * evolve: improve content-divergence resolution that involves parent changes
+  * evolve: preserve wdir parent when using `hg evolve --stop`
   * obslog: clarify the command name in the help,
   * pdiff, pstatus: drop some irrelevant command flags inherited from `hg diff`
     and `hg status` respectively
@@ -66,7 +67,6 @@
   * evolve: while resolving conflicts, the evolved node will no longer be a
     dirstate parent (won't show up in `hg parents` and not as `@` in `hg log -G`,
     but it will show up as `%` with hg >= 5.4)
-  * evolve: preserve wdir parent when using `hg evolve --stop`
 
   * metaedit: update bookmark location when applicable