diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2009-02-10 15:35:18 -0700 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2009-02-10 15:35:18 -0700 |
| commit | 3f037ead2724697c7b754ecd47757d1ef07425ae (patch) | |
| tree | ec1c7b691fa85b9e240f1a14bc8b44688a6d6c2b | |
| parent | c23a35c90445f5b63c83bd68923c5987caf9362f (diff) | |
Make the internal merge pattern a bit more general
| -rw-r--r-- | patterns.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 .*$") |