diff options
Diffstat (limited to 'templates/hooks--pre-commit')
| -rw-r--r-- | templates/hooks--pre-commit | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit index 7092bae263..b25dce6bbf 100644 --- a/templates/hooks--pre-commit +++ b/templates/hooks--pre-commit @@ -61,7 +61,7 @@ perl -e ' if (/^\s* \t/) { bad_line("indent SP followed by a TAB", $_); } - if (/^(?:[<>=]){7}/) { + if (/^([<>])\1{6} |^={7}$/) { bad_line("unresolved merge conflict", $_); } } |