summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-19 21:58:24 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-19 22:37:40 (GMT)
commit61c2bcbd11e3b66a328b3850c01592e5dc1c67bb (patch)
treee0993e24ded9047c25d3ff9bdff58791f9699026 /t
parent50ac7408018209a2829b7948119270fec7e14ec8 (diff)
downloadgit-61c2bcbd11e3b66a328b3850c01592e5dc1c67bb.zip
git-61c2bcbd11e3b66a328b3850c01592e5dc1c67bb.tar.gz
git-61c2bcbd11e3b66a328b3850c01592e5dc1c67bb.tar.bz2
pre-commit hook: complain about conflict markers.
Several <<< or === or >>> characters at the beginning of a line is very likely to be leftover conflict markers from a failed automerge the user resolved incorrectly, so detect them. As usual, this can be defeated with "git commit --no-verify" if you really do want to have those files, just like changes that introduce trailing whitespaces. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions