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

Version history of lua/mediate/conflict.lua

October 2025

hensel.dev
·