diff -r d0965c5c5335 -r 184c64c81528 CHANGELOG --- a/CHANGELOG Fri Jun 14 18:44:43 2019 -0700 +++ b/CHANGELOG Fri Jul 19 17:25:29 2019 +0800 @@ -7,6 +7,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)