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

1 files changed, 1 insertions, 1 deletions

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'