Mercurial > evolve

diff CHANGELOG @ 4315:55ca0b6276e7 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 24 Dec 2018 17:47:31 +0100
parents 8aa28e68ac44
children 97b18934d6db
line wrap: on
line diff
--- a/CHANGELOG	Fri Dec 21 20:14:23 2018 +0100
+++ b/CHANGELOG	Mon Dec 24 17:47:31 2018 +0100
@@ -4,6 +4,7 @@
 8.3.3 - in progress
 -------------------
 
+  * evolve: properly detect unresolved merge conflict (issue-5966)
   * evolve: fix possible crash when the repo changes during evolve (issue-6028)
   * test: avoid leaking `hg serve` process
   * topic: fix error message for the `ngtip` revset