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

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