git: use kdiff3 as mergetool

Conflicts:
	gitconfig