lib/divining_rod/mash.rb in divining_rod-0.6.2 vs lib/divining_rod/mash.rb in divining_rod-0.6.3

- old
+ new

@@ -3,11 +3,11 @@ def initialize(hsh = {}) self.replace(hsh || {}) end - def merge(opts = {}) - return self if opts.nil? + def merge(opts) + opts = opts.dup if self[:tags] || opts[:tags] tags = Array(self[:tags]) | Array(opts[:tags]) opts[:tags] = tags end super(opts)