summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-03 04:45:08 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-03 04:45:08 +0000
commitc38dec6d3b1c775b93289c4f3086a87787d4c959 (patch)
treec3ef059ea5a69e9188c4dca7307972969acb5ef9 /tool
parentf9042329dd48b1c09751a93624ef5eb1e826074e (diff)
* tool/merger.rb: allow r0123 style revision number.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-xtool/merger.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/tool/merger.rb b/tool/merger.rb
index a521b0ea16..2f9625ce90 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -132,9 +132,9 @@ else
revs.each do |rev|
case rev
- when /\A\d+:\d+\z/
+ when /\Ar?\d+:r?\d+\z/
r = ['-r', rev]
- when /\A\d+\z/
+ when /\Ar?\d+\z/
r = ['-c', rev]
when nil then
puts "#$0 revision"