Add new plugin to Neovim for easier merges
I'll give it a try and check how well it works.
This commit is contained in:
parent
cdbf6a8680
commit
126b0fa422
|
@ -107,11 +107,16 @@
|
||||||
|
|
||||||
merge = {
|
merge = {
|
||||||
ff = true;
|
ff = true;
|
||||||
tool = "nvimdiff4";
|
tool = "new";
|
||||||
|
conflictStyle = "diff3";
|
||||||
};
|
};
|
||||||
|
|
||||||
"mergetool \"nvimdiff4\"" = {
|
"mergetool \"nvimdiff4\"" = {
|
||||||
cmd = "${pkgs.neovim}/bin/nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'diffoff'";
|
cmd = "${pkgs.neovim}/bin/nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'diffoff'";
|
||||||
};
|
};
|
||||||
|
"mergetool \"new\"" = {
|
||||||
|
cmd = "${pkgs.neovim}/bin/nvim -f $MERGED $BASE $LOCAL $REMOTE -c 'MergetoolStart'";
|
||||||
|
trustExitCode = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -267,7 +267,14 @@ in {
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
||||||
vim-fugitive
|
fugitive
|
||||||
|
{
|
||||||
|
plugin = vim-mergetool;
|
||||||
|
config = ''
|
||||||
|
let g:mergetool_layout = 'b,lr,m'
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
|
||||||
vim-commentary
|
vim-commentary
|
||||||
vim-indent-object
|
vim-indent-object
|
||||||
vim-textobj-comment
|
vim-textobj-comment
|
||||||
|
|
Loading…
Reference in a new issue