diff options
Diffstat (limited to 'lib/redmine/scm/adapters/bazaar_adapter.rb')
| -rw-r--r-- | lib/redmine/scm/adapters/bazaar_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb index 39afb0565..4d2c74147 100644 --- a/lib/redmine/scm/adapters/bazaar_adapter.rb +++ b/lib/redmine/scm/adapters/bazaar_adapter.rb @@ -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 |