Mercurial > evolve

diff CHANGELOG @ 3979:db44da7b9097 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changelog: update with issue5927 fix
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 20 Aug 2018 23:04:37 +0200
parents ea7687a9a4b8
children b4d0245c7f40
line wrap: on
line diff
--- 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