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 -------------------