X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=templates%2Fhooks--pre-commit;h=18b87309f65be23794b87260e08c547f5deeefce;hb=b3abdd9d216c578383b66bb10b95edb3380640e7;hp=43d3b6ef4a0e515cdc8d9874a81029d4d9425f64;hpb=1a17ee22a2fbd85a893ab36fd53168d03554c2dd;p=git.git

diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index 43d3b6ef4..18b87309f 100644
--- a/templates/hooks--pre-commit
+++ b/templates/hooks--pre-commit
@@ -61,8 +61,10 @@ perl -e '
 	    if (/^\s* 	/) {
 		bad_line("indent SP followed by a TAB", $_);
 	    }
+	    if (/^(?:[<>=]){7}/) {
+		bad_line("unresolved merge conflict", $_);
+	    }
 	}
     }
     exit($found_bad);
 '
-