diff CHANGELOG @ 5999:0dc06a569791 mercurial-5.4

test-compat: merge mercurial-5.5 into mercurial-5.4

--- a/CHANGELOG	Thu May 27 23:25:57 2021 +0800
+++ b/CHANGELOG	Thu Aug 12 22:00:54 2021 +0200
@@ -1,11 +1,27 @@
 Changelog
 =========
 
-10.3.2 - in progress
+10.3.3 - in progress
+--------------------
+
+  * fold: make sure to save commit messages in last-message.txt, also affects
+    metaedit (issue6549)
+
+topic (0.22.3)
+
+  * topic: correctly update from public commits with a (now hidden) topic
+    when hg update is called without any revision (issue6553)
+
+10.3.2 - 2021-05-28
 --------------------
 
   * next: remove duplicated targets when updating from an unstable changeset
   * evolve: use "served" repo filter to guess what the server will publish
+  * touch/fold/metaedit/rewind: no longer lose changes from merge commits
+    (issue6416). As a consequence (for technical reasons), when run with
+    Mercurial 5.5 and earlier, these commands now require there to be no
+    unresolved conflicts.
+
 
 topic (0.22.2)