Skip to content
Snippets Groups Projects
Commit 61c2bcbd authored by Junio C Hamano's avatar Junio C Hamano
Browse files

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: default avatarJunio C Hamano <junkio@cox.net>
parent 50ac7408
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment