Mercurial > evolve
diff 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 |
line wrap: on
line diff
--- a/CHANGELOG Wed May 23 01:11:59 2018 +0530 +++ b/CHANGELOG Wed Jun 06 04:09:49 2018 +0530 @@ -5,6 +5,7 @@ ------------------- * evolve: handle branch changes when solving content divergence, + * evolve: add a help section dedicated to interrupted evolve, 8.0.1 -- in-progress ---------------------