Mercurial > piecrust2

diff piecrust/configuration.py @ 978:7e51d14097cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: Properly pass the merge mode to the `merge_dicts` function.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 29 Oct 2017 22:46:41 -0700
parents f070a4fc033c
children c0c00dc1eac7
line wrap: on
line diff
--- a/piecrust/configuration.py	Tue Oct 17 01:11:54 2017 -0700
+++ b/piecrust/configuration.py	Sun Oct 29 22:46:41 2017 -0700
@@ -83,6 +83,7 @@
                 "Unsupported value type to merge: %s" % type(other))
 
         merge_dicts(self._values, other_values,
+                    mode=mode,
                     validator=self._validateValue)
 
     def validateTypes(self, allowed_types=default_allowed_types):