diff -r 1340d6718a88 -r 85a97f37c78f CHANGELOG --- 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)