bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Using vimdiff as git merge tool

Browse source
This commit is contained in:
Filippo Berto 2025-06-16 11:13:34 +02:00
parent 735af95b32
commit 6566c9bead
Signed by: bertof
GPG key ID: 9DBF7E6A1D2CE9ED
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/hm/git.nix
View file

@ -118,13 +118,13 @@ in
algorithm = "histogram"; algorithm = "histogram";
colorMoved = "default"; colorMoved = "default";
guitool = "meld"; guitool = "meld";
tool = "meld"; tool = "vimdiff";
}; };
init.defaultBranch = "main"; init.defaultBranch = "main";
merge = { merge = {
conflictstyle = "diff3"; conflictstyle = "diff3";
guitool = "meld"; guitool = "meld";
tool = "meld"; tool = "vimdiff";
}; };
pull.rebase = true; pull.rebase = true;
rebase = { rebase = {