Mercurial > evolve

diff CHANGELOG @ 4729:076b6813a7ea

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 Wed, 17 Jul 2019 18:06:14 +0200
parents 77bf84025dd5 ef8907df73fc
children 12a88b988875
line wrap: on
line diff
--- a/CHANGELOG	Mon Jul 15 16:53:07 2019 -0700
+++ b/CHANGELOG	Wed Jul 17 18:06:14 2019 +0200
@@ -20,6 +20,7 @@
   * pick: properly report and cleanup "unfinished state"
   * prune: don't update wcp if pruned revision are unrelated (issue6137)
   * evolve: properly prune changeset with no change in case of conflict (issue5967)
+  * touch: detect resulting divergence in more cases (issue6107)
 
 9.0.0 -- 2019-06-06
 -------------------