barrett/diffs.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 13
diffs.nvim/lua
History
Exact
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
..
diffs feat(conflict): show branch names in virtual text labels 2026-02-07 17:57:53 -05:00