• Joined on 2026-03-13
barrett created branch feat/conflict-ui in barrett/diffs.nvim 2026-03-13 18:04:36 +00:00
barrett pushed to feat/conflict-ui at barrett/diffs.nvim 2026-03-13 18:04:36 +00:00
2834b588f1 docs: trim readme features list
861f83600a refactor(conflict): keep default virtual text labels minimal
c9e2722d19 Merge branch 'main' into feat/conflict-ui
6e1a053bc4 feat(conflict): add virtual text formatting and action lines
Compare 4 commits »
barrett created branch feat/context-highlights in barrett/diffs.nvim 2026-03-13 18:04:36 +00:00
barrett pushed to feat/context-highlights at barrett/diffs.nvim 2026-03-13 18:04:36 +00:00
e570bf3980 fix(types): allow false sentinel in file_cache type annotation
70e623fcce feat(highlight): wire highlights.context config into treesitter pipeline
Compare 2 commits »
barrett created branch feat/context-padding in barrett/diffs.nvim 2026-03-13 18:04:36 +00:00
barrett pushed to feat/context-padding at barrett/diffs.nvim 2026-03-13 18:04:36 +00:00
barrett created branch feat/deslop in barrett/diffs.nvim 2026-03-13 18:04:36 +00:00
barrett pushed to feat/deslop at barrett/diffs.nvim 2026-03-13 18:04:36 +00:00
barrett created branch feat/diff-header-highlight in barrett/diffs.nvim 2026-03-13 18:04:36 +00:00
barrett pushed to feat/diff-header-highlight at barrett/diffs.nvim 2026-03-13 18:04:36 +00:00
f35287bdfe feat: treesitter highlighting for diff headers
barrett created branch feat/diffsplit in barrett/diffs.nvim 2026-03-13 18:04:36 +00:00
barrett pushed to feat/diffsplit at barrett/diffs.nvim 2026-03-13 18:04:36 +00:00
barrett created branch feat/email-quoted-diffs in barrett/diffs.nvim 2026-03-13 18:04:36 +00:00
barrett pushed to feat/email-quoted-diffs at barrett/diffs.nvim 2026-03-13 18:04:36 +00:00
af3e186ecb ci: format
a6433da5f4 feat(parser,highlight): support email-quoted diffs (#141)
Compare 2 commits »
barrett pushed tag v0.7.7 to barrett/cp.nvim 2026-03-13 18:04:35 +00:00
barrett pushed tag v0.8.0 to barrett/cp.nvim 2026-03-13 18:04:35 +00:00
barrett pushed tag v0.8.1 to barrett/cp.nvim 2026-03-13 18:04:35 +00:00
barrett created branch doc/merge-conflicts in barrett/diffs.nvim 2026-03-13 18:04:35 +00:00
barrett pushed to doc/merge-conflicts at barrett/diffs.nvim 2026-03-13 18:04:35 +00:00
f3a72926d2 doc: add plug mappings for merge conflict resolution
barrett created branch doc/readme-preview in barrett/diffs.nvim 2026-03-13 18:04:35 +00:00