]> xenbits.xensource.com Git - people/larsk/xenproject-org-gitdm.git/commitdiff
Make the internal merge pattern a bit more general
authorJonathan Corbet <corbet@lwn.net>
Tue, 10 Feb 2009 22:35:18 +0000 (15:35 -0700)
committerJonathan Corbet <corbet@lwn.net>
Tue, 10 Feb 2009 22:35:18 +0000 (15:35 -0700)
patterns.py

index 1e81869c89c124543fd1e44af28e267fc726aae0..ca34586485b2cb50becfad3b43b7d2257e9fdb4e 100644 (file)
@@ -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 .*$")