diff -r 0852dcba82f6 -r 8a491546e81d CHANGELOG
--- a/CHANGELOG	Wed Aug 28 18:30:58 2019 +0700
+++ b/CHANGELOG	Sat Sep 07 13:03:29 2019 +0700
@@ -5,6 +5,7 @@
 -------------------
 
   * evolve: test that target is not orig in _solveunstable() (issue6097)
+  * fold: check allowdivergence before folding obsolete changesets (issue5817)
   * obslog: correct spacing of patch output with word-diff=yes (issue6175)
   * stack: make sure to preserve dependencies, fixes certain complex cases