Barrett Ruth 238df23ee0 feat(conflict): show branch names in virtual text labels ... Problem: virtual text showed generic "current"/"incoming" labels with no indication of which branch each side came from. Solution: extract the branch name from the marker line itself (e.g. <<<<<<< HEAD, >>>>>>> feature) and display as "HEAD (current)" / "feature (incoming)".		2026-02-07 17:57:53 -05:00
..
commands.lua	fix(commands): add diff buffer UX improvements	2026-02-07 16:48:31 -05:00
conflict.lua	feat(conflict): show branch names in virtual text labels	2026-02-07 17:57:53 -05:00
debug.lua	fix(debug): resolve sparse array crash in json dump	2026-02-07 00:50:02 -05:00
diff.lua	fix(diff): strip linematch from char-level diff	2026-02-07 00:50:08 -05:00
fugitive.lua	feat(fugitive): line position tracking for keymaps	2026-02-05 00:27:35 -05:00
git.lua	feat(git): add index and working tree content retrieval	2026-02-04 22:23:09 -05:00
health.lua	feat(highlight): add character-level intra-line diff highlighting	2026-02-06 13:53:58 -05:00
highlight.lua	fix(ci): remove unused variable	2026-02-07 15:12:44 -05:00
init.lua	feat(conflict): detect and resolve inline merge conflict markers	2026-02-07 17:38:34 -05:00
lib.lua	feat(highlight): add character-level intra-line diff highlighting	2026-02-06 13:53:58 -05:00
log.lua	feat: add :Gdiff, :Gvdiff, :Ghdiff commands for unified diff view	2026-02-04 19:52:17 -05:00
parser.lua	feat(highlight): add treesitter context padding from disk	2026-02-07 13:05:53 -05:00