# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1534799077 -7200
# Node ID db44da7b9097f606c3906d4dac2041626af3926a
# Parent  fb8e44c707981108df6a531574388c5278198231
changelog: update with issue5927 fix

diff -r fb8e44c70798 -r db44da7b9097 CHANGELOG
--- a/CHANGELOG	Sat Aug 18 21:03:45 2018 +0530
+++ b/CHANGELOG	Mon Aug 20 23:04:37 2018 +0200
@@ -4,6 +4,7 @@
 8.1.1 - in progress
 -------------------
 
+  * evolve: properly set second parent during conflict (issue5927)
   * next: fix topic restriction when passing --evolve
   * clone: fix possible crash when using clone bundle and forcing cache warming
   * obshashrange: fix speed and consistency issues during cache invalidation