# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1698175894 10800
# Node ID 5199463aef07cfac7d081ef9f1f1587b5f1c8907
# Parent  94bf2f307b75f4423f6da42873da6ad9542fee92
changelog: update for 11.1.0 one more time

diff -r 94bf2f307b75 -r 5199463aef07 CHANGELOG
--- a/CHANGELOG	Mon Dec 11 16:51:27 2023 -0300
+++ b/CHANGELOG	Tue Oct 24 16:31:34 2023 -0300
@@ -8,6 +8,10 @@
     recommended for all users, clients and servers
 
   * evolve: don't warn about topics while resolving public content-divergence
+  * evolve: add obsdiff as alternative for odiff
+  * evolve: retain certain commit extras when relocating a commit
+
+  * pick: update commit message hashes like other rewrite commands
 
   * evolve, pullbundle: drop compatibility with Mercurial 4.8
 
@@ -16,8 +20,6 @@
   * remove deprecated serverminitopic extension, topic extension is recommended
     for all users, clients and servers
 
-  * pick: update commit message hashes like other rewrite commands
-
   * topic namespaces: add `experimental.tns-allow-rewrite` config option to
     check topic namespace before rewriting changesets (known limitations: does
     not prevent rebase and histedit from editing changesets outside of