Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CHANGELOG
branchmercurial-4.7
changeset 4312 108b08a16260
parent 4311 8aa28e68ac44
child 4317 97b18934d6db 
--- a/CHANGELOG	Fri Dec 21 20:14:18 2018 +0100
+++ b/CHANGELOG	Mon Dec 24 17:47:27 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
evolve