dln/dotfiles
0
0
Code Issues Pull requests2 Activity

jj: Add diffconflicts merge tool

Browse source
This commit is contained in:
Daniel Lundin 2025-06-26 19:12:50 +02:00
commit a3de1f893e
Signed by: dln
SSH key fingerprint: SHA256:dQy1Xj3UiqJYpKR5ggQ2bxgz4jCH8IF+k3AB8o0kmdI
2 changed files with 27 additions and 0 deletions
home/common/nvim
default.nix

13
home/common/nvim/default.nix
View file

@ -99,6 +99,19 @@ in
'';
}
{
plugin = pkgs.vimUtils.buildVimPlugin {
name = "jj-diffconflicts";
src = pkgs.fetchFromGitHub {
owner = "rafikdraoui";
repo = "jj-diffconflicts";
rev = "8140e5295ef2008a947f1f374c2d71a5bc7e38a0";
hash = "sha256-LM2eP29yK+lIlWzJiIKIRcbVjNhyjV2unE4GJDTLKXQ=";
};
};
type = "lua";
}
{
plugin = pkgs.vimUtils.buildVimPlugin {
name = "dieter-nvim";