Mercurial > evolve
changeset 4637:4a22dac48b42
changelog: mention user merging in the changelog
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 27 May 2019 02:42:11 +0200 |
parents | c0e9a3c01c44 |
children | 7978db1dda3e |
files | CHANGELOG |
diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Sun May 05 18:24:59 2019 +0530 +++ b/CHANGELOG Mon May 27 02:42:11 2019 +0200 @@ -12,6 +12,7 @@ * evolve: reinstalled compatibility with narrow repositories, * evolve: use "unstable" instead of "troubled" * evolve: run multiple stabilisation in the same transaction + * evolve: improve users merging during content-divergence * topic: drop the b# alias. It conflicted with normal hashes. 8.5.1 -- 2019-04-23