mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-24 17:58:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

plugins/git-conflict: init

Browse source
This commit is contained in:
Gaetan Lepage 2024-05-27 13:56:16 +02:00 • committed by Gaétan Lepage
parent 4175fac0ea
commit a2afa56344
3 changed files with 142 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

47
tests/test-sources/plugins/git/git-conflict.nix Normal file
View file

@ -0,0 +1,47 @@
{
empty = {
plugins.git-conflict.enable = true;
};
defaults = {
plugins.git-conflict = {
enable = true;
settings = {
default_mappings = true;
default_commands = true;
disable_diagnostics = false;
list_opener = "copen";
highlights = {
incoming = "DiffAdd";
current = "DiffText";
ancestor = null;
};
};
};
};
example = {
plugins.git-conflict = {
enable = true;
settings = {
default_mappings = {
ours = "o";
theirs = "t";
none = "0";
both = "b";
next = "n";
prev = "p";
};
default_commands = true;
disable_diagnostics = false;
list_opener = "copen";
highlights = {
incoming = "DiffAdd";
current = "DiffText";
};
};
};
};
}