# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1558917731 -7200
# Node ID 4a22dac48b4217e48782ac4cdfdfb3b4ff951509
# Parent  c0e9a3c01c44c2b6950d4bc2f4eb6c8e95fe8104
changelog: mention user merging in the changelog

diff -r c0e9a3c01c44 -r 4a22dac48b42 CHANGELOG
--- 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