From fe46bec769dcf3447c53ab320961397cf8af1627 Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 7 Mar 2015 00:18:46 +0000
Subject: * tool/merger.rb: Added documentation to version method.   [fix
 GH-847][ci skip] Patch by @magikid

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      | 5 +++++
 tool/merger.rb | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 16d8f35a0e..01986e2680 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar  7 09:18:42 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* 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@atdot.net>
 
 	* class.c (rb_prepend_module): need a WB for klass -> origin.
diff --git a/tool/merger.rb b/tool/merger.rb
index cd23a56cb3..68073ea1a5 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -40,6 +40,8 @@ def help
 end
 end
 
+# Prints the version of Ruby found in version.h
+
 def version
   v = p = nil
   open 'version.h', 'rb' do |f|
-- 
cgit v1.2.3