X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fhooks--pre-commit;h=723a9ef210bb84c217026c2cdf9d30661f64447b;hb=4511c899e64cbda934ba864c359a2a7a04909264;hp=43d3b6ef4a0e515cdc8d9874a81029d4d9425f64;hpb=9086a18cb81f99fff943b36830396ac8c37c7e9f;p=git.git

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