summaryrefslogtreecommitdiff
path: root/tool/merger.rb
diff options
context:
space:
mode:
Diffstat (limited to 'tool/merger.rb')
-rwxr-xr-xtool/merger.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/merger.rb b/tool/merger.rb
index d8ae16016b..6f82541e0d 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -112,7 +112,7 @@ def tag intv_p = false
end
def default_merge_branch
- /branches\/ruby_1_8_/ =~ IO.binread(".svn/entries", 100) ? 'branches/ruby_1_8' : 'trunk'
+ %r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk'
end
case ARGV[0]