From cfca95265c8a5c35cd634ac1535ac29e5989d39a Mon Sep 17 00:00:00 2001
From: Burt Holzman <burt@fnal.gov>
Date: Wed, 7 Sep 2011 16:52:37 -0500
Subject: [PATCH] Fix parsing of merge information

---
 lib/git_commit_notifier/diff_to_html.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/git_commit_notifier/diff_to_html.rb b/lib/git_commit_notifier/diff_to_html.rb
index 3717e43..d2ed978 100644
--- 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?