summaryrefslogtreecommitdiff
path: root/lib/rdoc/options.rb
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-07 02:52:15 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-07 02:52:15 +0000
commitd9d3e87a522ce180768aef2fcb32c236c68b07f2 (patch)
tree1d843e4b26e1f4b59757ce6980b9e61df7cdd887 /lib/rdoc/options.rb
parent063beac3436cb94bf51cb9fec08b34e977563faa (diff)
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
Diffstat (limited to 'lib/rdoc/options.rb')
-rw-r--r--lib/rdoc/options.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
index 259fef487bb..0b12efe9be9 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'