kastdeur/dotfiles
1
0
Fork 0
mirror of https://github.com/kastdeur/dotfiles.git synced 2025-05-15 04:19:23 +02:00
Code Issues Releases Wiki Activity

Various from Locksmith

Browse source
This commit is contained in:
Eric-Teunis de Boone 2017-08-26 13:30:58 +02:00
parent ecd9e69323
commit 57953d9c90
6 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
git/gitconfig
View file

@ -14,3 +14,7 @@
ui = auto
[merge]
conflictstyle = diff3
[branch]
autosetuprebase = always
[diff]
tool = vimdiff