diff options
-rwxr-xr-x | tool/merger.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tool/merger.rb b/tool/merger.rb index 020f2de937..7c734a5e0a 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -217,7 +217,7 @@ else if l.empty? l = IO.popen %w'svn log ' + r + [q] do |f| f.read - end.sub(/\A-+\nr.*\n/, '').sub(/\n-+\n\z/, '').gsub(/^./, "\t\\&") + end.sub(/\A-+\nr.*/, '').sub(/\n-+\n\z/, '').gsub(/^./, "\t\\&") end log_svn << l @@ -247,7 +247,7 @@ else version_up f = Tempfile.new 'merger.rb' - f.printf "merge revision(s) %s:%s\n", revstr, tickets + f.printf "merge revision(s) %s:%s", revstr, tickets f.write log_svn f.flush f.close |