From: Jean-Luc Herren <jlh@gmx.ch>
Date: Mon, 14 Jan 2008 21:47:42 +0000 (+0100)
Subject: Make default pre-commit hook less noisy
X-Git-Tag: v1.5.4-rc4~40
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c60b528225d2827fd43d4fe4b082e0188df7a280?hp=c60b528225d2827fd43d4fe4b082e0188df7a280

Make default pre-commit hook less noisy

This hook thought to have found a conflict marker any time it saw
a 7-character combination of any of the characters '<>=' at the
beginning of a line, whereas it should only look for the *same*
character to appear repeatedly.

Also, restrict it to match exactly 7 times, to avoid matching the
underlining with '='-characters often used in documentation.

Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---