Mercurial > evolve

changeset 5001:cb78c6efbbdb stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changelog: mention the date fix for content divergence
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 10 Dec 2019 21:03:23 +0100
parents a9457b9aca4e
children a3f692bcbbf4
files CHANGELOG
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Tue Dec 10 20:35:56 2019 +0100
+++ b/CHANGELOG	Tue Dec 10 21:03:23 2019 +0100
@@ -14,6 +14,7 @@
   * evolve: use more often seen metavariables in command synopsis strings
   * documentation: update text and add missing figures
   * amend: cleany abort when both `--patch` and `--extract` are passed
+  * evolve: also merge the date field when solving content-divergence
 
 9.2.1 -- 2019-10-05
 -------------------