Marty Oehme 0a3ca9f2b1 nvim: Add git conflict resolution mappings ... Added simple merge conflict highlighting and resolution through git-conflict.nvim plugin. Allows moving to the next/prev conflict with ]x or [x respectively, then resolving the conflict currently hovered by using ours/theirs/ both/or neither of the offered options (with `ho/hO/hm/hM` respectively).		2023-08-07 11:30:09 +02:00
..
nvim	nvim: Add git conflict resolution mappings	2023-08-07 11:30:09 +02:00
sh/env.d	nvim: Bootstrap spellfile if not existing	2022-12-08 13:39:40 +01:00