fix merge commit detection

stevepeak · stevepeak · commit b26a45044921 · 2016-04-29T10:09:01.000-04:00
diff --git a/codecov/__init__.py b/codecov/__init__.py
@@ -24,13 +24,13 @@
     pass
 
 
-version = VERSION = __version__ = '2.0.2'
+version = VERSION = __version__ = '2.0.3'
 
 COLOR = True
 
 remove_token = re.compile(r'token=[^\&]+').sub
 
-is_merge_commit = re.compile(r'^Merge\s\w{40}\s\w{40}$')
+is_merge_commit = re.compile(r'^Merge\s\w{40}\sinto\s\w{40}$')
 
 ignored_path = re.compile(r'(/vendor)|'
                           r'(/js/generated/coverage)|'
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 import sys
 
-version = '2.0.2'
+version = '2.0.3'
 classifiers = ["Development Status :: 5 - Production/Stable",
                "Environment :: Plugins",
                "Intended Audience :: Developers",

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`from setuptools import setup`
`3`	`3`	`import sys`
`4`	`4`
`5`		`-version = '2.0.2'`
	`5`	`+version = '2.0.3'`
`6`	`6`	`classifiers = ["Development Status :: 5 - Production/Stable",`
`7`	`7`	`"Environment :: Plugins",`
`8`	`8`	`"Intended Audience :: Developers",`