schtobia/dotfiles
1
0
Fork 0
Code Issues Pull requests Activity

gitconfig: switched to vimdiff

Browse source
This commit is contained in:
Tobias Schmidl 2020-07-23 10:27:59 +02:00
parent 374a519f89
commit 97ef83ef1a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.config/gitconfig
View file

@ -23,7 +23,7 @@
[merge]
conflictstyle = diff3
renormalize = true
tool = vimdiff3
tool = vimdiff
[pack]
threads = 0
[pull]