changeset 5812:5fdf6faaf977

evolve: add CHANGELOG entry
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sat, 05 Sep 2020 09:24:33 +0530
parents 4688b7eb7e40
children 741b2ae7ca4b
files CHANGELOG
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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