Keyboard shortcuts

Press or to navigate between chapters

Press S or / to search in the book

Press ? to show this help

Press Esc to hide this help

git-conflict

URL: https://github.com/akinsho/git-conflict.nvim/

Maintainers: Gaetan Lepage


A plugin to visualise and resolve merge conflicts in neovim.

plugins.git-conflict.enable

Whether to enable git-conflict.

Type: boolean

Default:

false

Example:

true

Declared by:

plugins.git-conflict.package

The git-conflict package to use.

Type: package

Default:

pkgs.vimPlugins.git-conflict-nvim

Declared by:

plugins.git-conflict.autoLoad

Whether to automatically load git-conflict when neovim starts.

Type: boolean

Default: false when lazy-loading is enabled.

Example:

false

Declared by:

plugins.git-conflict.callSetup

Whether to generate the standard require('git-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: