Mercurial > evolve
diff CHANGELOG @ 5789:d0389ddf402d
changelog: add an entry aboutt improved divergence resolution
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 22 Feb 2021 17:37:53 +0100 |
| parents | eadc1d09f2f5 |
| children | b1d1903df29e |
line wrap: on
line diff
--- a/CHANGELOG Sun Jan 24 20:09:28 2021 +0530 +++ b/CHANGELOG Mon Feb 22 17:37:53 2021 +0100 @@ -1,6 +1,11 @@ Changelog ========= +10.3.0 - in progress +-------------------- + + * evolve: improves content-divergence resolution that involve parent changes + 10.2.0.post1 -- 2021-02-01 --------------------------