diff options
Diffstat (limited to 'tool')
-rwxr-xr-x | tool/merger.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/merger.rb b/tool/merger.rb index 6f82541e0d..ef24027452 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] |