Mercurial > hgrepos > Python > libs > ConfigMix

diff CHANGES.txt @ 638:ef485419d723

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIX: Now the merge logic does not interpolate variables in any case. Previously it did sometimes.
author Franz Glasner <f.glasner@feldmann-mg.com>
date Fri, 04 Mar 2022 18:14:12 +0100
parents 4499e9b4855d
children 078ffa821af4
line wrap: on
line diff
--- a/CHANGES.txt	Fri Mar 04 17:35:27 2022 +0100
+++ b/CHANGES.txt	Fri Mar 04 18:14:12 2022 +0100
@@ -21,6 +21,10 @@
   configurations: sometimes they were tried to be interpolated -- and
   this failed.
 
+- **[bugfix]**
+  The merge login should never interpolate variables. But some parts
+  of the merge logic did this unintentionally.
+
 
 0.20.4 (2022-01-17)
 ~~~~~~~~~~~~~~~~~~~