From: Jonathan Corbet <corbet@lwn.net>
Date: Tue, 10 Feb 2009 22:35:18 +0000 (-0700)
Subject: Make the internal merge pattern a bit more general
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3f037ead2724697c7b754ecd47757d1ef07425ae;p=people%2Flarsk%2Fxenproject-org-gitdm.git

Make the internal merge pattern a bit more general
---

diff --git a/patterns.py b/patterns.py
index 1e81869..ca34586 100644
--- a/patterns.py
+++ b/patterns.py
@@ -35,4 +35,5 @@ Preptest = re.compile (r'reported-and-tested-by:' + Pemail, re.I)
 #
 PExtMerge = re.compile(r'^ +Merge( branch .* of)? ([^ ]+:[^ ]+)\n$')
 PIntMerge = re.compile(r'^ +(Merge|Pull) .* into .*$')
-PIntMerge2 = re.compile(r"^ +Merge branch(es)? '.*$")
+# PIntMerge2 = re.compile(r"^ +Merge branch(es)? '.*$")
+PIntMerge2 = re.compile(r"^ +Merge .*$")