Barrett Ruth 804421ed17 merge: resolve conflicts with main ... Problem: `feat/telescope` diverged from `main` after the vimdoc rewrite and committia docs landed upstream. Solution: merge `origin/main`, resolve conflicts in `init.lua` (keep telescope config additions), and add telescope.nvim section to the vimdoc with upstream bug reference.		2026-03-06 13:42:34 -05:00
..
diffs.nvim.txt	merge: resolve conflicts with main	2026-03-06 13:42:34 -05:00