Commit 6a54a0c9 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang

Fixed: Bazaar "[merge]" tags parsing fails (#3445).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2780 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 9c282842
......@@ -89,7 +89,7 @@ module Redmine
else
next unless revision
if line =~ /^revno: (\d+)$/
if line =~ /^revno: (\d+)($|\s\[merge\]$)/
revision.identifier = $1.to_i
elsif line =~ /^committer: (.+)$/
revision.author = $1.strip
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment