Barrett Ruth 74c2dd4c7a docs: document conflict resolution config and highlight groups		2026-02-07 17:39:35 -05:00
..
diffs.nvim.txt	docs: document conflict resolution config and highlight groups	2026-02-07 17:39:35 -05:00