danielsiepmann/nixpkgs
danielsiepmann/nixpkgs
1
0
Code Releases Activity

Use my own git diff setup

Browse source 
That one includes local base and remote at top.
It turns diffthis off for the merged result to have proper code
highlighting of result.
This commit is contained in:
Daniel Siepmann 2022-02-21 13:39:22 +01:00
parent fd8a22c0f9
commit 00320b8a48
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
home/programs/git.nix
View file

@ -107,7 +107,11 @@
merge = {
ff = true;
tool = "nvimdiff";
tool = "nvimdiff4";
};
"mergetool \"nvimdiff4\"" = {
cmd = "nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'diffoff'";
};
};
}