Merge deep

This commit is contained in:
Anatol Broder 2014-06-08 21:27:06 +02:00
parent 579d9fc813
commit 5f807e7421
1 changed files with 3 additions and 3 deletions

View File

@ -41,10 +41,10 @@ module Jekyll
old_scope = nil
matching_sets(path, type).each do |set|
if has_precedence?(old_scope, set['scope'])
defaults.merge! set['values']
defaults.deep_merge! set['values']
old_scope = set['scope']
else
defaults = set['values'].merge(defaults)
defaults = set['values'].deep_merge(defaults)
end
end
defaults