From d9d3e87a522ce180768aef2fcb32c236c68b07f2 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 7 Jan 2008 02:52:15 +0000
Subject: Merge documentation from the same class on ri generation. Fixes bug
 where documentation could disappear.

Fix typo in lib/rdoc/options.rb

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/options.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/rdoc/options.rb')

diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
index 259fef487b..0b12efe9be 100644
--- a/lib/rdoc/options.rb
+++ b/lib/rdoc/options.rb
@@ -352,7 +352,7 @@ class Options
       @op_name = nil
       @show_all = false
       @main_page = nil
-      @marge     = false
+      @merge     = false
       @exclude   = []
       @quiet = false
       @generator_name = 'html'
-- 
cgit v1.2.3