summaryrefslogtreecommitdiff
path: root/constructor.py
diff options
context:
space:
mode:
authorAnthon van der Neut <anthon@mnt.org>2017-06-24 07:18:46 +0200
committerAnthon van der Neut <anthon@mnt.org>2017-06-24 07:18:46 +0200
commit325d9d4f536aad2f1ee2f0cd74d61791b3561fac (patch)
treee3dc7cb1b883d339d2cf33f02c5de026f9b47a81 /constructor.py
parent84b55be25f6969f4df3a3ad7badad7bde6da1dc0 (diff)
downloadruamel.yaml-325d9d4f536aad2f1ee2f0cd74d61791b3561fac.tar.gz
fix issue #130: regression in nested merges
Diffstat (limited to 'constructor.py')
-rw-r--r--constructor.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/constructor.py b/constructor.py
index a37f794..19fe5ca 100644
--- a/constructor.py
+++ b/constructor.py
@@ -342,7 +342,7 @@ class SafeConstructor(BaseConstructor):
index += 1
if bool(merge):
node.merge = merge # separate merge keys to be able to update without duplicate
- # node.value = merge + node.value
+ node.value = merge + node.value
def construct_mapping(self, node, deep=False):
# type: (Any, bool) -> Any