* tool/merger.rb: Add a tool to merge commits between branches.

  developed by URABE Shyouhei

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 747ebf7437..ce831222cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 19 18:15:50 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/merger.rb: Add a tool to merge commits between branches.
+	  developed by URABE Shyouhei
+
 Thu Aug 19 17:19:09 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* backport r28621 and r28632 from ruby_1_8;