X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=templates%2Fhooks--pre-commit;h=b25dce6bbfa5e52108459b9a89b16def6963aec0;hb=fae09a8084c9b51632726523b477a78dd28d7d7e;hp=8b057be30411e3f0074599778666c1254d82329e;hpb=9d25acc49a98ca82988ad871753a45e41f3c90f5;p=git.git

diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index 8b057be30..b25dce6bb 100644
--- 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", $_);
 	    }
 	}