diff CHANGELOG @ 5987:e97fbded40a5

branching: merge stable into default

--- a/CHANGELOG	Sat Jun 19 22:13:13 2021 +0300
+++ b/CHANGELOG	Fri Aug 06 00:04:46 2021 +0200
@@ -11,11 +11,25 @@
     they were replaced by --orphan, --content-divergent and --phase-divergent
     respectively a long time ago
 
+10.3.3 - in progress
+--------------------
+
+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)