Mercurial > evolve

comparison CHANGELOG @ 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 b03d955e391e
children af2602c354d8
comparison
equal deleted inserted replaced
3484:6d180db0e3e8 3487:14b9cded3c81
4 7.3.0 --(in-progress) 4 7.3.0 --(in-progress)
5 --------------------- 5 ---------------------
6 6
7 * grab: new command to grab a changeset, put in on wdir parent 7 * grab: new command to grab a changeset, put in on wdir parent
8 and update to it 8 and update to it
9 * resolve: shows how to continue evolve after resolving all conflicts
9 10
10 7.2.2 -- (in-progress) 11 7.2.2 -- (in-progress)
11 ---------------------- 12 ----------------------
12 13
13 * fold: fix issue related to bookmarks movement (issue5772) 14 * fold: fix issue related to bookmarks movement (issue5772)