sonny/arch-setup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set default git mergetool

Browse source
This commit is contained in:
Sonny Bakker 2024-07-16 11:08:02 +02:00
parent 556acd2480
commit cf061d3779
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
templates/gitconfig.j2
View file

@ -8,3 +8,6 @@ editor = nvim
[pull] [pull]
rebase = false rebase = false
[merge]
tool = nvimdiff