diff CHANGELOG @ 6009:9fb6249d6002 stable

changelog: mention the fix to touch + merge
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 13 Aug 2021 19:13:24 +0200
parents 4c208bb90c5b
children 45d3f40a8466
line wrap: on
line diff
--- a/CHANGELOG	Fri Aug 13 19:07:58 2021 +0200
+++ b/CHANGELOG	Fri Aug 13 19:13:24 2021 +0200
@@ -7,6 +7,7 @@
   * evolve: compatibility with Mercurial 5.9
   * fold: make sure to save commit messages in last-message.txt, also affects
     metaedit (issue6549)
+  * touch: fix `hg touch` on merge commits
 
 topic (0.22.3)