Merge branch 'sp/mergetool'

diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index 723a9ef210bb84c217026c2cdf9d30661f64447b..a19279b3e41653b519b8c3b266bc7845f3648c4b 100644 (file)
--- a/templates/hooks--pre-commit
+++ b/templates/hooks--pre-commit
@@ -58,7 +58,7 @@ perl -e '
            if (/\s$/) {
                bad_line("trailing whitespace", $_);
            }
-           if (/^\s*   /) {
+           if (/^\s* \t/) {
                bad_line("indent SP followed by a TAB", $_);
            }
            if (/^(?:[<>=]){7}/) {
@@ -68,4 +68,3 @@ perl -e '
     }
     exit($found_bad);
 '
-