Mercurial > evolve

diff 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
line wrap: on
line diff
--- a/CHANGELOG	Fri Jun 07 02:25:02 2019 +0200
+++ b/CHANGELOG	Thu Jun 06 17:37:42 2019 +0800
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+9.1.0 - in progress
+-------------------
+
+  * evolve: use the same wording as core in case of unresolved conflict
+
 9.0.0 -- 2019-06-06
 -------------------