plugins.git-conflict.settings

Options provided to the require('git-conflict').setup function.

Type: attribute set of anything

Default: { }

Example:

{
  default_commands = true;
  default_mappings = {
    both = "b";
    next = "n";
    none = "0";
    ours = "o";
    prev = "p";
    theirs = "t";
  };
  disable_diagnostics = false;
  highlights = {
    current = "DiffText";
    incoming = "DiffAdd";
  };
  list_opener = "copen";
}

Declared by:

plugins.git-conflict.settings.default_commands

Set to false to disable commands created by this plugin.

Type: null or boolean or raw lua code

Default: null

Plugin default: true

Declared by:

plugins.git-conflict.settings.default_mappings

This plugin offers default buffer local mappings inside conflicted files. This is primarily because applying these mappings only to relevant buffers is impossible through global mappings.

Set to false to disable mappings entirely.

Defaults (if left true):

  {
    ours = "co";
    theirs = "ct";
    none = "c0";
    both = "cb";
    next = "[x";
    prev = "]x";
  }

Type: null or boolean or attribute set of string

Default: null

Plugin default: true

Declared by:

plugins.git-conflict.settings.disable_diagnostics

This will disable the diagnostics in a buffer whilst it is conflicted.

Type: null or boolean or raw lua code

Default: null

Plugin default: false

Declared by:

plugins.git-conflict.settings.list_opener

Command or function to open the conflicts list.

Type: null or string or raw lua code

Default: null

Plugin default: "copen"

Declared by: