diff -r 6d180db0e3e8 -r 14b9cded3c81 CHANGELOG --- a/CHANGELOG Mon Feb 05 14:36:34 2018 +0100 +++ b/CHANGELOG Sun Feb 04 21:05:03 2018 +0530 @@ -6,6 +6,7 @@ * grab: new command to grab a changeset, put in on wdir parent and update to it + * resolve: shows how to continue evolve after resolving all conflicts 7.2.2 -- (in-progress) ----------------------