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