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

feat(git): show merge conflicts in 3-way style

Browse source
This commit is contained in:
Michael Mandl 2025-02-26 08:23:04 +01:00
parent f73891c335
commit bc21047420
Signed by: mandlm
GPG key ID: 088ED38F036C7AF2
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
git/default.nix
View file

@ -62,8 +62,11 @@
log.date = "relative"; log.date = "relative";
merge.ff = false; merge = {
merge.tool = "nvim"; conflictstyle = "zdiff3";
ff = false;
tool = "nvim";
};
mergetool.nvim.cmd = "nvim -d $BASE $LOCAL $REMOTE $MERGED -c 'DiffviewOpen'"; mergetool.nvim.cmd = "nvim -d $BASE $LOCAL $REMOTE $MERGED -c 'DiffviewOpen'";
mergetool.nvim.trustExitCode = false; mergetool.nvim.trustExitCode = false;