| @@ -89,7 +89,7 module Redmine | |||||
| 89 | else |
|
89 | else | |
| 90 | next unless revision |
|
90 | next unless revision | |
| 91 |
|
91 | |||
| 92 | if line =~ /^revno: (\d+)$/ |
|
92 | if line =~ /^revno: (\d+)($|\s\[merge\]$)/ | |
| 93 | revision.identifier = $1.to_i |
|
93 | revision.identifier = $1.to_i | |
| 94 | elsif line =~ /^committer: (.+)$/ |
|
94 | elsif line =~ /^committer: (.+)$/ | |
| 95 | revision.author = $1.strip |
|
95 | revision.author = $1.strip | |
General Comments 0
You need to be logged in to leave comments.
Login now