# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1628874804 -7200
# Node ID 9fb6249d600203675fffa82be69438596efe00c7
# Parent  4c208bb90c5b500d5b3f6ca525273f3ce45b5c48
changelog: mention the fix to touch + merge

diff -r 4c208bb90c5b -r 9fb6249d6002 CHANGELOG
--- 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)