dot/git
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Enable kdiff3 by default and allow OS-specific packages to override

Browse source
This commit is contained in:
Danielle McLean 2016-11-19 19:07:49 +11:00
parent c0f087d8e2
commit 8430953d9c
No known key found for this signature in database
GPG key ID: CC91589719027E94
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/git/config
View file

@ -1,4 +1,7 @@
# vim: ft=gitconfig
[include]
path = tools/kdiff3
path = config.os
path = config.local
[user]

5
config/git/tools/kdiff3 Normal file
View file

@ -0,0 +1,5 @@
# vim: ft=gitconfig
[merge]
tool = kdiff3
[diff]
tool = kdiff3