projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-svn: add UTF-8 message test
[git.git]
/
templates
/
hooks--pre-commit
diff --git
a/templates/hooks--pre-commit
b/templates/hooks--pre-commit
index
43d3b6e
..
723a9ef
100644
(file)
--- 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);