kastdeur/dotfiles
1
0
Fork 0
mirror of https://github.com/kastdeur/dotfiles.git synced 2024-12-22 09:13:33 +01:00
Code Issues Releases Wiki Activity

New GitMergeTool + IdentityKeys for ssh

Browse source
This commit is contained in:
Eric Teunis de Boone 2016-10-30 00:09:14 +02:00
parent fec8135663
commit 45a61379dc
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git/gitconfig
View file

@ -12,3 +12,5 @@
excludesfile = ~/.gitignore_global excludesfile = ~/.gitignore_global
[color] [color]
ui = auto ui = auto
[merge]
conflictstyle = diff3