Mercurial > hg > check_whitespace

changeset 15:3c168c892742

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Extend merge conflict regexp.
author Sjoerd Mullender <sjoerd@acm.org>
date Wed, 12 Jun 2019 09:05:17 +0200 (2019-06-12)
parents 026da0bbb4ef
children 86405cf4b913
files check_whitespace.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/check_whitespace.py	Wed May 01 22:19:57 2019 +0200
+++ b/check_whitespace.py	Wed Jun 12 09:05:17 2019 +0200
@@ -43,7 +43,7 @@
     lnre = re.compile(r'@@ -\d+,\d+ \+(?P<lineno>\d+),')
     wsre = re.compile(r'\+.*[ \t]$')
     tbre = re.compile(r'\+.*\t')
-    resre = re.compile(r'\+(<<<<<<<|>>>>>>>)')
+    resre = re.compile(r'\+(<<<<<<<|>>>>>>>|======= end)')
     adding = False
     islink = False              # symlinks can have no newline at end