# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1599278073 -19800
# Node ID 5fdf6faaf977571ea2fb0bcf1ef110a5850486ba
# Parent  4688b7eb7e40fd445769d183c92583ad2f9e2dda
evolve: add CHANGELOG entry

diff -r 4688b7eb7e40 -r 5fdf6faaf977 CHANGELOG
--- a/CHANGELOG	Wed Aug 26 23:27:17 2020 +0530
+++ b/CHANGELOG	Sat Sep 05 09:24:33 2020 +0530
@@ -66,6 +66,7 @@
   * 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