Mercurial Repositories > eric / changeset
changeset
Another fix for the VCS conflict markers regexp.
Sat, 03 Feb 2018 18:05:22 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 03 Feb 2018 18:05:22 +0100
- changeset 6109
- 041715a2f703
- parent 6108
- 59cf5a66b0b3
- child 6110
- a7b096ecf963
Another fix for the VCS conflict markers regexp.
| Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py | file | annotate | diff | comparison | revisions |
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py Sat Feb 03 17:40:17 2018 +0100 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py Sat Feb 03 18:05:22 2018 +0100 @@ -28,13 +28,13 @@ VcsConflictMarkerRegExpList = ( re.compile( - r"""^<<<<<<< .*?=======.*?>>>>>>> .*?$""", + r"""^<<<<<<< .*?\|\|\|\|\|\|\| .*?=======.*?>>>>>>> .*?$""", re.MULTILINE | re.DOTALL ), re.compile( - r"""^<<<<<<< .*?||||||| .*?=======.*?>>>>>>> .*?$""", + r"""^<<<<<<< .*?=======.*?>>>>>>> .*?$""", re.MULTILINE | re.DOTALL - ) + ), ) def initService():
