mirror of
https://github.com/git/git.git
synced 2024-11-20 15:14:05 +01:00
c60b528225
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> |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| branches-- | ||
| hooks--applypatch-msg | ||
| hooks--commit-msg | ||
| hooks--post-commit | ||
| hooks--post-receive | ||
| hooks--post-update | ||
| hooks--pre-applypatch | ||
| hooks--pre-commit | ||
| hooks--pre-rebase | ||
| hooks--update | ||
| info--exclude | ||
| Makefile | ||
| this--description | ||