Mercurial > evolve

diff CHANGELOG @ 3854:b1eb2dea6737

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changelog: add an entry about the new `evolve.interrupted` section
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 28 Jun 2018 17:26:16 +0200
parents 9ebed1e95ef7
children 9c0b37be8582
line wrap: on
line diff
--- 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
 -------------------