Mercurial > evolve

diff CHANGELOG @ 4320:b4bc185bcefb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 24 Dec 2018 18:38:25 +0100
parents 78700a59192a 97b18934d6db
children e2350851740a
line wrap: on
line diff
--- a/CHANGELOG	Thu Dec 20 13:59:07 2018 +0800
+++ b/CHANGELOG	Mon Dec 24 18:38:25 2018 +0100
@@ -17,9 +17,10 @@
   * stack: introduce a --children flag (see help for details)
   * topic: make --age compatible with the usual other display for `hg topic`
 
-8.3.3 - in progress
+8.3.3 -- 2017-12-24
 -------------------
 
+  * 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