# vim: ft=gitconfig
[merge]
	tool = kdiff3
[diff]
	tool = kdiff3