From 8a2183b2d911fe014e94275a723124c9e5a34c0f Mon Sep 17 00:00:00 2001
From: Christian Beier <dontmind@freeshell.org>
Date: Tue, 29 Mar 2011 17:29:53 +0200
Subject: [PATCH] Fix skipping of merge commits in log convert script.

---
 utils/git2cl.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utils/git2cl.pl b/utils/git2cl.pl
index 1c2ab3f..6a8a1e7 100755
--- a/utils/git2cl.pl
+++ b/utils/git2cl.pl
@@ -321,9 +321,10 @@ while (my $_l = <$fh>) {
         # Luis Mondesi <lemsx1@gmail.com>
         my $_s = $_l;
 	$_s =~ s/^    //g;
-        if ($_s =~ m/^Merge branch/)
+        if ($_s =~ m/^Merge branch|^Merge remote branch/)
         {
             $state=0;
+            $author=0;
             next;
         }
 	$comment = $comment . $_s;