usa	2012-10-12 16:07:10 +0900 (Fri, 12 Oct 2012)

  New Revision: 37154

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

  Log:
    * tool/merger.rb: now can merge revision(s) without --ticket again.

  Modified files:
    trunk/ChangeLog
    trunk/tool/merger.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37153)
+++ ChangeLog	(revision 37154)
@@ -1,3 +1,7 @@
+Fri Oct 12 16:06:20 2012  NAKAMURA Usaku  <usa@r...>
+
+	* tool/merger.rb: now can merge revision(s) without --ticket again.
+
 Fri Oct 12 14:10:41 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (dir_config, init_mkmf): use configured libdir value as
Index: tool/merger.rb
===================================================================
--- tool/merger.rb	(revision 37153)
+++ tool/merger.rb	(revision 37154)
@@ -131,6 +131,8 @@
   if /--ticket=(.*)/ =~ ARGV[0]
     tickets = $1.split(/,/).map{|num| " [Backport ##{num}]"}
     ARGV.shift
+  else
+    tickets = []
   end
 
   q = $repos + (ARGV[1] || default_merge_branch)

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