summaryrefslogtreecommitdiff
path: root/lib/rdoc/options.rb
diff options
context:
space:
mode:
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 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'