jj: Add diffconflicts merge tool
This commit is contained in:
parent
1ea0eff81a
commit
a3de1f893e
2 changed files with 27 additions and 0 deletions
home
|
@ -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 {
|
plugin = pkgs.vimUtils.buildVimPlugin {
|
||||||
name = "dieter-nvim";
|
name = "dieter-nvim";
|
||||||
|
|
|
@ -69,6 +69,20 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
"merge-tools" = {
|
"merge-tools" = {
|
||||||
|
diffconflicts = {
|
||||||
|
program = "nvim";
|
||||||
|
merge-args = [
|
||||||
|
"-c"
|
||||||
|
"let g:jj_diffconflicts_marker_length=$marker_length"
|
||||||
|
"-c"
|
||||||
|
"JJDiffConflicts!"
|
||||||
|
"$output"
|
||||||
|
"$base"
|
||||||
|
"$left"
|
||||||
|
"$right"
|
||||||
|
];
|
||||||
|
merge-tool-edits-conflict-markers = true;
|
||||||
|
};
|
||||||
difft."diff-args" = [
|
difft."diff-args" = [
|
||||||
"--color=always"
|
"--color=always"
|
||||||
"$left"
|
"$left"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue