=== modified file 'lib/redmine/scm/adapters/bazaar_adapter.rb'
--- lib/redmine/scm/adapters/bazaar_adapter.rb	2008-11-08 15:28:00 +0000
+++ lib/redmine/scm/adapters/bazaar_adapter.rb	2009-06-05 10:22:06 +0000
@@ -89,7 +89,7 @@
               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