Merge git://git.kernel.org/pub/scm/gitk/gitk

[git.git] / templates / hooks--pre-commit

diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index 8b057be30411e3f0074599778666c1254d82329e..b25dce6bbfa5e52108459b9a89b16def6963aec0 100644 (file)
--- a/templates/hooks--pre-commit
+++ b/templates/hooks--pre-commit
@@ -58,10 +58,10 @@ perl -e '
            if (/\s$/) {
                bad_line("trailing whitespace", $_);
            }
-           if (/^\s*   /) {
+           if (/^\s* \t/) {
                bad_line("indent SP followed by a TAB", $_);
            }
-           if (/^(?:[<>=]){7}/) {
+           if (/^([<>])\1{6} |^={7}$/) {
                bad_line("unresolved merge conflict", $_);
            }
        }