Skip to content
Snippets Groups Projects
Commit 9ebed1e9 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

changelog: add a changelog entry about divergence resolution

We made a lots of progress there.
parent 340cf6fb
No related branches found
No related tags found
No related merge requests found
......@@ -5,7 +5,11 @@
-------------------
* evolve: handle branch changes when solving content divergence,
* evolve: improve multiple aspect of divergence resolution
* branch changes handling,
* parent changes handling,
* divergent stack handling,
* evolve: add a help section dedicated to interrupted evolve,
* evolve: merge commit messages when resolving content divergence (issue5877)
* evolve: show unfinished state information in `hg status -v` (issue5886)
* evolve: add a new `--no-update` flag to keep working copy on the initial
......@@ -8,8 +12,8 @@
* evolve: add a help section dedicated to interrupted evolve,
* evolve: merge commit messages when resolving content divergence (issue5877)
* evolve: show unfinished state information in `hg status -v` (issue5886)
* evolve: add a new `--no-update` flag to keep working copy on the initial
revision.
revision.
8.0.1 -- 2018-06-11
-------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment