diff CHANGELOG @ 4779:85a97f37c78f mercurial-5.0

branching: merge the two mercurial-5.0 heads
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 29 Jul 2019 14:42:49 +0200
parents 184c64c81528 076b6813a7ea
children 83d0bed86ced
line wrap: on
line diff
--- a/CHANGELOG	Mon Jul 29 13:19:54 2019 +0200
+++ b/CHANGELOG	Mon Jul 29 14:42:49 2019 +0200
@@ -19,6 +19,7 @@
   * pick: no longer forget file in case of conflict (issue6037)
   * pick: properly report and cleanup "unfinished state"
   * prune: don't update wcp if pruned revision are unrelated (issue6137)
+  * prune: spell --successor flag without any unnecessary shortcuts
   * evolve: properly prune changeset with no change in case of conflict (issue5967)
   * touch: detect resulting divergence in more cases (issue6107)