Merge branch 'maint-1.5.4' into maint-1.5.5

diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index 7092bae26342d273f28d52ac330c270a22067f65..b25dce6bbfa5e52108459b9a89b16def6963aec0 100644 (file)
--- 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", $_);
            }
        }