Marty Oehme
0a3ca9f2b1
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). |
||
|---|---|---|
| .. | ||
| .config | ||