hsbt	2015-03-07 09:18:46 +0900 (Sat, 07 Mar 2015)

  New Revision: 49876

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49876

  Log:
    * tool/merger.rb: Added documentation to version method.
      [fix GH-847][ci skip] Patch by @magikid

  Modified files:
    trunk/ChangeLog
    trunk/tool/merger.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49875)
+++ ChangeLog	(revision 49876)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Mar  7 09:18:42 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* tool/merger.rb: Added documentation to version method.
+	  [fix GH-847][ci skip] Patch by @magikid
+
 Fri Mar  6 22:50:36 2015  Koichi Sasada  <ko1@a...>
 
 	* class.c (rb_prepend_module): need a WB for klass -> origin.
Index: tool/merger.rb
===================================================================
--- tool/merger.rb	(revision 49875)
+++ tool/merger.rb	(revision 49876)
@@ -40,6 +40,8 @@ def help https://github.com/ruby/ruby/blob/trunk/tool/merger.rb#L40
 end
 end
 
+# Prints the version of Ruby found in version.h
+
 def version
   v = p = nil
   open 'version.h', 'rb' do |f|

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/