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 6f82541e0d1..ef240274529 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -153,7 +153,7 @@ else
if log_svn.empty?
log_svn = IO.popen %w'svn log ' + r + [q] do |f|
f.read
- end
+ end.sub(/\A-+\nr.*\n/, '').sub(/\n-+\n\z/, '').gsub(/^(?=\S)/, "\t")
end
a = %w'svn merge --accept=postpone' + r + [q]