From: Junio C Hamano <junkio@cox.net>
Date: Wed, 19 Apr 2006 21:58:24 +0000 (-0700)
Subject: pre-commit hook: complain about conflict markers.
X-Git-Tag: v1.3.1~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/61c2bcbd11e3b66a328b3850c01592e5dc1c67bb?ds=inline;hp=61c2bcbd11e3b66a328b3850c01592e5dc1c67bb

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>
---