Barrett Ruth bae86c5fd9 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:58:51 -05:00
..
diffs	feat(conflict): show branch names in virtual text labels	2026-02-07 17:58:51 -05:00