Jo 393d0ad41d Improve merge conflict marker detection (#1937) ...

## Summary

- make `check-merge-conflict` detect conflict blocks contextually
instead of flagging any bare `=======`
- add support for diff3 ancestor markers (`|||||||`)

Closes #1924 
Closes #1523

2026-04-14 10:59:51 +08:00

..

assets

Remove background from logo (#1322)

2026-01-07 22:45:33 +08:00

proposals

Add mdformat pre-commit hook (#1416)

2026-01-20 11:26:37 +08:00

authoring-hooks.md

Disambiguate “hook” terminology by renaming "Git hooks" to "Git shims" (#1776)

2026-03-11 11:46:52 +08:00

benchmark.md

Rename prek install-hooks to prek prepare-hooks, prek install --install-hooks to prek install --prepare-hooks (#1766)

2026-03-10 13:06:01 +08:00

builtin.md

Improve merge conflict marker detection (#1937)

2026-04-14 10:59:51 +08:00

changelog.md

Move docs to zensical (#1421)

2026-01-20 19:44:15 +08:00

cli.md

Honor repo and worktree core.hooksPath (#1892)

2026-04-13 17:11:44 +08:00

compatibility.md

Document compatibility with pre-commit (#1767)

2026-03-10 13:06:27 +08:00

configuration.md

Update docs for case of hooks modifying files with a non-zero exit code (#1879)

2026-04-01 17:26:07 +08:00

debugging.md

docs: fix HTML anchors, grammar, capitalization, and add missing tracking issues (#1448)

2026-01-22 02:06:13 +08:00

diff.md

Document compatibility with pre-commit (#1767)

2026-03-10 13:06:27 +08:00

faq.md

Honor repo and worktree core.hooksPath (#1892)

2026-04-13 17:11:44 +08:00

index.md

Add prek run --no-fail-fast to override config file (#1859)

2026-03-24 17:57:22 +08:00

installation.md

Document winget install j178.Prek (#1670)

2026-02-19 22:24:18 +08:00

integrations.md

Bump version to 0.3.9 (#1934)

2026-04-13 17:33:35 +08:00

languages.md

Refine dotnet SDK version handling and tests (#1870)

2026-03-30 22:41:07 +08:00

quickstart.md

Disambiguate “hook” terminology by renaming "Git hooks" to "Git shims" (#1776)

2026-03-11 11:46:52 +08:00

workspace.md

Allow selectors for hook ids containing colons (#1782)

2026-03-13 22:20:27 +08:00