diff options
Diffstat (limited to 'bin/mongrel_rails')
-rw-r--r-- | bin/mongrel_rails | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/mongrel_rails b/bin/mongrel_rails index 6eae4bc..61306bc 100644 --- a/bin/mongrel_rails +++ b/bin/mongrel_rails @@ -80,7 +80,7 @@ class Start < GemPlugin::Plugin "/commands" if @config_file STDERR.puts "** Loading settings from #{@config_file} (command line options override)." conf = YAML.load_file(@config_file) - settings = conf.merge(settings) + settings = settings.merge! conf end config = Mongrel::Rails::RailsConfigurator.new(settings) do |