changeset 3487 | 14b9cded3c81 |
parent 3456 | b03d955e391e |
child 3496 | af2602c354d8 |
--- 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) ----------------------