mandlm/home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(nvim): use diffview-nvim for diffs and merges

Browse source
This commit is contained in:
Michael Mandl 2025-02-12 16:23:34 +01:00
parent 2cca40f5e8
commit fd14195ccd
Signed by: mandlm
GPG key ID: 088ED38F036C7AF2
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
git/default.nix
View file

@ -44,7 +44,8 @@
merge.ff = false;
merge.tool = "nvim";
mergetool.nvim.cmd = "nvim -f -c \"Gdiffsplit!\" \"$MERGED\"";
mergetool.nvim.cmd = "nvim -d $BASE $LOCAL $REMOTE $MERGED -c 'DiffviewOpen'";
mergetool.nvim.trustExitCode = false;
mergetool.prompt = false;
pager.difftool = true;