From 727c8cdfe7d5769d403f180b539e08e0f03eae2f Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 12 Oct 2012 07:07:10 +0000 Subject: * tool/merger.rb: now can merge revision(s) without --ticket again. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/merger.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tool/merger.rb') diff --git a/tool/merger.rb b/tool/merger.rb index b7ceb86df3..d3bc0e9edc 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -131,6 +131,8 @@ else if /--ticket=(.*)/ =~ ARGV[0] tickets = $1.split(/,/).map{|num| " [Backport ##{num}]"} ARGV.shift + else + tickets = [] end q = $repos + (ARGV[1] || default_merge_branch) -- cgit v1.2.3