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

use vim for merging

Browse source
This commit is contained in:
Tobias Schmidl 2018-05-17 12:57:53 +02:00
parent 41b4dfa6b0
commit 77a279f8ad
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gitconfig
View file

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