# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1530199576 -7200
# Node ID b1eb2dea6737080b16a7bb2243cba01c47624fa5
# Parent  796334340cad9a20d148dcac0037894d7ec8cf72
changelog: add an entry about the new `evolve.interrupted` section

diff -r 796334340cad -r b1eb2dea6737 CHANGELOG
--- a/CHANGELOG	Fri Jun 15 00:50:17 2018 +0530
+++ b/CHANGELOG	Thu Jun 28 17:26:16 2018 +0200
@@ -14,6 +14,8 @@
   * evolve: show unfinished state information in `hg status -v` (issue5886)
   * evolve: add a new `--no-update` flag to keep working copy on the initial
             revision.
+  * evolve: new help section dedicated to resuming operation interrupted by
+            merge conflit, `hg help evolve.interrupted`.
 
 8.0.1 -- 2018-06-11
 -------------------