Mercurial > evolve

comparison CHANGELOG @ 4676:b6c819facbe8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolvecmd: the proper way to deal with conflicts is to resolve them And it's worth making the suggestion an actual hint.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 06 Jun 2019 17:37:42 +0800
parents 756db65030c6
children 36c2bac8cab3
comparison
equal deleted inserted replaced
4669:daab6d665687 4676:b6c819facbe8
1 Changelog 1 Changelog
2 ========= 2 =========
3
4 9.1.0 - in progress
5 -------------------
6
7 * evolve: use the same wording as core in case of unresolved conflict
3 8
4 9.0.0 -- 2019-06-06 9 9.0.0 -- 2019-06-06
5 ------------------- 10 -------------------
6 11
7 * evolve: preserve the working directory after resolving instability (BC) 12 * evolve: preserve the working directory after resolving instability (BC)