From 3def9e601111f64ec9b7e2dc0323953b7be0db65 Mon Sep 17 00:00:00 2001
From: Jocelyn Le Sage <jocelyn.lesage@hp.com>
Date: Thu, 22 May 2014 08:49:58 -0400
Subject: [PATCH] Properly merge options.

---
 lib/cmock.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cmock.rb b/lib/cmock.rb
index 2b49896..1695059 100644
--- a/lib/cmock.rb
+++ b/lib/cmock.rb
@@ -77,7 +77,7 @@ if ($0 == __FILE__)
   filelist = []
   ARGV.each do |arg|
     if (arg =~ /^-o\"?([a-zA-Z0-9._\\\/:\s]+)\"?/)
-      options.merge CMockConfig.load_config_file_from_yaml( arg.gsub(/^-o/,'') )
+      options.merge! CMockConfig.load_config_file_from_yaml( arg.gsub(/^-o/,'') )
     elsif (arg =~ /^--([a-zA-Z0-9._\\\/:\s]+)=\"?([a-zA-Z0-9._\\\/:\s\;]+)\"?/)
       options = option_maker(options, $1, $2)
     else