# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1604136332 -28800
# Node ID fe31179e1941199f4488eeb8454f2328a6f04372
# Parent  71cc223fd109d77cd72ff8a0a71caef17004ce34# Parent  87ee065a688be1e3d40336572ca6d5273927757c
branching: merge into stable in preparation for release

diff -r 87ee065a688b -r fe31179e1941 CHANGELOG
--- a/CHANGELOG	Sat Oct 31 02:34:31 2020 +0800
+++ b/CHANGELOG	Sat Oct 31 17:25:32 2020 +0800
@@ -26,6 +26,7 @@
 --------------------
 
   * evolve: specific the source of config override for `server.bundle1=no`
+  * evolve: avoid leaving mergestate after instability resolution
   * metaedit: update bookmark location when applicable
 
 10.0.2 -- 2020-09-08
diff -r 87ee065a688b -r fe31179e1941 hgext3rd/evolve/compat.py