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

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