A very simple Neovim plugin to help you with manual Git conflict resolution.
README.md

mediate.nvim #

A very simple Neovim plugin to help you with manual Git conflict resolution.

Status
Work in Progress, but usable

Development #

this section carried over from nvim-lua-plugin-template

Run tests #

Running tests requires plenary.nvim to be checked out in the parent directory of this repository. You can then run:

nvim --headless --noplugin -u tests/minimal.vim -c "PlenaryBustedDirectory tests/ {minimal_init = 'tests/minimal.vim'}"

Or if you want to run a single test file:

nvim --headless --noplugin -u tests/minimal.vim -c "PlenaryBustedDirectory tests/path_to_file.lua {minimal_init = 'tests/minimal.vim'}"