Mercurial > evolve
comparison CHANGELOG @ 3796:ededd22e7c7b
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
The help list various flags which you can use during interrupted evolve
resolution and description about what they do. This will be very helpful for
user on how to continue an interrupted evolve.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 06 Jun 2018 04:09:49 +0530 |
| parents | b89108d3eca0 |
| children | 1de50022e888 |
comparison
equal
deleted
inserted
replaced
| 3795:b8b4ff86feb8 | 3796:ededd22e7c7b |
|---|---|
| 3 | 3 |
| 4 8.1.0 - in progress | 4 8.1.0 - in progress |
| 5 ------------------- | 5 ------------------- |
| 6 | 6 |
| 7 * evolve: handle branch changes when solving content divergence, | 7 * evolve: handle branch changes when solving content divergence, |
| 8 * evolve: add a help section dedicated to interrupted evolve, | |
| 8 | 9 |
| 9 8.0.1 -- in-progress | 10 8.0.1 -- in-progress |
| 10 --------------------- | 11 --------------------- |
| 11 | 12 |
| 12 * next-prev: respect commands.update.check config option (issue5808) | 13 * next-prev: respect commands.update.check config option (issue5808) |