Mercurial > evolve

changeset 3487:14b9cded3c81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CHANGELOG: add an entry about resolve showing how to continue evolve
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 04 Feb 2018 21:05:03 +0530
parents 6d180db0e3e8
children 1baf32675ec6
files CHANGELOG
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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)
 ----------------------