Fix parsing of merge information

agerlic · Sep 7, 2011 · cfca952 · cfca952
1 parent 3469f66
commit cfca952
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/git_commit_notifier/diff_to_html.rb b/lib/git_commit_notifier/diff_to_html.rb
@@ -328,8 +328,8 @@ def extract_commit_info_from_git_show_output(content)
           result[:committer], result[:commit_email] = author_name_and_email(line[12..-1])
         elsif line =~ /^CommitDate:/
           result[:commit_date] = line[12..-1]
-        elsif line =~ /^Merge/
-          result[:merge] = line[12..-1]
+        elsif line =~ /^Merge:/
+          result[:merge] = line[7..-1]
         else
           clean_line = line.strip
           result[:message] << clean_line unless clean_line.empty?