diff options
Diffstat (limited to 'yaml.html.markdown')
| -rw-r--r-- | yaml.html.markdown | 6 | 
1 files changed, 5 insertions, 1 deletions
| diff --git a/yaml.html.markdown b/yaml.html.markdown index ab0f9d55..8683971e 100644 --- a/yaml.html.markdown +++ b/yaml.html.markdown @@ -121,6 +121,10 @@ other_anchor: *anchor_name  base: &base    name: Everyone has same name +# The regexp << is called Merge Key Language-Independent Type. It is is used to +# indicate that all the keys of one or more specified maps should be inserted +# into the current map. +  foo: &foo    <<: *base    age: 10 @@ -167,7 +171,7 @@ set:    ? item3  or: {item1, item2, item3} -# Like Python, sets are just maps with null values; the above is equivalent to: +# Sets are just maps with null values; the above is equivalent to:  set2:    item1: null    item2: null | 
