Mercurial > evolve

diff CHANGELOG @ 3794:b89108d3eca0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 05 Jun 2018 03:37:15 +0200
parents 5b9e3aaa6da8 3343c5491b31
children ededd22e7c7b
line wrap: on
line diff
--- a/CHANGELOG	Tue Jun 05 03:36:40 2018 +0200
+++ b/CHANGELOG	Tue Jun 05 03:37:15 2018 +0200
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+8.1.0 - in progress
+-------------------
+
+  * evolve: handle branch changes when solving content divergence,
+
 8.0.1 -- in-progress
 ---------------------