Mercurial > evolve

changeset 3803:1de50022e888

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CHANGELOG: add an entry about fixing issue5877
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 06 Jun 2018 03:49:17 +0530
parents 4bad80f1aad3
children 509b1e66f0b9
files CHANGELOG
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Wed Jun 06 03:26:47 2018 +0530
+++ b/CHANGELOG	Wed Jun 06 03:49:17 2018 +0530
@@ -6,6 +6,7 @@
 
   * evolve: handle branch changes when solving content divergence,
   * evolve: add a help section dedicated to interrupted evolve,
+  * evolve: merge commit messages when resolving content divergence (issue5877)
 
 8.0.1 -- in-progress
 ---------------------