conflict
URL: https://github.com/niekdomi/conflict.nvim/
Maintainers: Jared Montoya
A simple Neovim plugin to resolve merge conflicts with ease.
plugins.conflict.enable
Whether to enable conflict.
Type: boolean
Default:
false
Example:
true
Declared by:
plugins.conflict.package
The conflict package to use.
Type: package
Default:
pkgs.vimPlugins.conflict-nvim
Declared by:
plugins.conflict.autoLoad
Whether to automatically load conflict when neovim starts.
Type: boolean
Default:
false when lazy-loading is enabled.
Example:
false
Declared by:
plugins.conflict.callSetup
Whether to generate the standard require('conflict').setup(...) call for this plugin.
By default, this follows the plugin’s built-in behavior. Set this to false
to disable the generated setup call, or to true to force it even when the
plugin would only call it conditionally.
Type: null or boolean
Default:
null
Declared by:
plugins.conflict.settings
Options provided to the require('conflict').setup function.
Type: lua value
Default:
{ }
Example:
{
default_mappings = {
base = "<leader>cb";
both = "<leader>ca";
current = "<leader>co";
incoming = "<leader>ct";
next = "]e";
none = "<leader>cn";
prev = "[e";
};
disable_diagnostics = false;
highlights = {
ancestor = "DiffDelete";
current = "DiffChange";
incoming = "DiffText";
};
show_actions = false;
}
Declared by: