Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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
authorPulkit Goyal <7895pulkit@gmail.com>
Sun, 04 Feb 2018 21:05:03 +0530
changeset 3487 14b9cded3c81
parent 3484 6d180db0e3e8
child 3488 1baf32675ec6
CHANGELOG: add an entry about resolve showing how to continue evolve
CHANGELOG file | annotate | diff | comparison | revisions 
--- 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)
 ----------------------
evolve