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
branchstable
changeset 4689 27947b17cfaf
parent 4687 313565dd75e3
child 4692 a9cf0ba6e6c7 
--- a/CHANGELOG	Sat Dec 22 18:31:32 2018 +0800
+++ b/CHANGELOG	Tue Jun 18 17:17:31 2019 +0800
@@ -5,6 +5,7 @@
 -------------------
 
   * pick: no longer forget file in case of conflict (issue6037)
+  * evolve: properly prune changeset with no change in case of conflict (issue5967)
 
 9.0.0 -- 2019-06-06
 -------------------
evolve